1. 25 Dec, 2016 23 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3ddc76df
      Linus Torvalds authored
      Pull timer type cleanups from Thomas Gleixner:
       "This series does a tree wide cleanup of types related to
        timers/timekeeping.
      
         - Get rid of cycles_t and use a plain u64. The type is not really
           helpful and caused more confusion than clarity
      
         - Get rid of the ktime union. The union has become useless as we use
           the scalar nanoseconds storage unconditionally now. The 32bit
           timespec alike storage got removed due to the Y2038 limitations
           some time ago.
      
           That leaves the odd union access around for no reason. Clean it up.
      
        Both changes have been done with coccinelle and a small amount of
        manual mopping up"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ktime: Get rid of ktime_equal()
        ktime: Cleanup ktime_set() usage
        ktime: Get rid of the union
        clocksource: Use a plain u64 instead of cycle_t
      3ddc76df
    • Linus Torvalds's avatar
      Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b272f732
      Linus Torvalds authored
      Pull SMP hotplug notifier removal from Thomas Gleixner:
       "This is the final cleanup of the hotplug notifier infrastructure. The
        series has been reintgrated in the last two days because there came a
        new driver using the old infrastructure via the SCSI tree.
      
        Summary:
      
         - convert the last leftover drivers utilizing notifiers
      
         - fixup for a completely broken hotplug user
      
         - prevent setup of already used states
      
         - removal of the notifiers
      
         - treewide cleanup of hotplug state names
      
         - consolidation of state space
      
        There is a sphinx based documentation pending, but that needs review
        from the documentation folks"
      
      * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/armada-xp: Consolidate hotplug state space
        irqchip/gic: Consolidate hotplug state space
        coresight/etm3/4x: Consolidate hotplug state space
        cpu/hotplug: Cleanup state names
        cpu/hotplug: Remove obsolete cpu hotplug register/unregister functions
        staging/lustre/libcfs: Convert to hotplug state machine
        scsi/bnx2i: Convert to hotplug state machine
        scsi/bnx2fc: Convert to hotplug state machine
        cpu/hotplug: Prevent overwriting of callbacks
        x86/msr: Remove bogus cleanup from the error path
        bus: arm-ccn: Prevent hotplug callback leak
        perf/x86/intel/cstate: Prevent hotplug callback leak
        ARM/imx/mmcd: Fix broken cpu hotplug handling
        scsi: qedi: Convert to hotplug state machine
      b272f732
    • Linus Torvalds's avatar
      Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 10bbe759
      Linus Torvalds authored
      Pull turbostat updates from Len Brown.
      
      * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        tools/power turbostat: remove obsolete -M, -m, -C, -c options
        tools/power turbostat: Make extensible via the --add parameter
        tools/power turbostat: Denverton uses a 25 MHz crystal, not 19.2 MHz
        tools/power turbostat: line up headers when -M is used
        tools/power turbostat: fix SKX PKG_CSTATE_LIMIT decoding
        tools/power turbostat: Support Knights Mill (KNM)
        tools/power turbostat: Display HWP OOB status
        tools/power turbostat: fix Denverton BCLK
        tools/power turbostat: use intel-family.h model strings
        tools/power/turbostat: Add Denverton RAPL support
        tools/power/turbostat: Add Denverton support
        tools/power/turbostat: split core MSR support into status + limit
        tools/power turbostat: fix error case overflow read of slm_freq_table[]
        tools/power turbostat: Allocate correct amount of fd and irq entries
        tools/power turbostat: switch to tab delimited output
        tools/power turbostat: Gracefully handle ACPI S3
        tools/power turbostat: tidy up output on Joule counter overflow
      10bbe759
    • Nicholas Piggin's avatar
      mm: add PageWaiters indicating tasks are waiting for a page bit · 62906027
      Nicholas Piggin authored
      Add a new page flag, PageWaiters, to indicate the page waitqueue has
      tasks waiting. This can be tested rather than testing waitqueue_active
      which requires another cacheline load.
      
      This bit is always set when the page has tasks on page_waitqueue(page),
      and is set and cleared under the waitqueue lock. It may be set when
      there are no tasks on the waitqueue, which will cause a harmless extra
      wakeup check that will clears the bit.
      
      The generic bit-waitqueue infrastructure is no longer used for pages.
      Instead, waitqueues are used directly with a custom key type. The
      generic code was not flexible enough to have PageWaiters manipulation
      under the waitqueue lock (which simplifies concurrency).
      
      This improves the performance of page lock intensive microbenchmarks by
      2-3%.
      
      Putting two bits in the same word opens the opportunity to remove the
      memory barrier between clearing the lock bit and testing the waiters
      bit, after some work on the arch primitives (e.g., ensuring memory
      operand widths match and cover both bits).
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: Bob Peterson <rpeterso@redhat.com>
      Cc: Steven Whitehouse <swhiteho@redhat.com>
      Cc: Andrew Lutomirski <luto@kernel.org>
      Cc: Andreas Gruenbacher <agruenba@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mel Gorman <mgorman@techsingularity.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      62906027
    • Nicholas Piggin's avatar
      mm: Use owner_priv bit for PageSwapCache, valid when PageSwapBacked · 6326fec1
      Nicholas Piggin authored
      A page is not added to the swap cache without being swap backed,
      so PageSwapBacked mappings can use PG_owner_priv_1 for PageSwapCache.
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: Bob Peterson <rpeterso@redhat.com>
      Cc: Steven Whitehouse <swhiteho@redhat.com>
      Cc: Andrew Lutomirski <luto@kernel.org>
      Cc: Andreas Gruenbacher <agruenba@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mel Gorman <mgorman@techsingularity.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6326fec1
    • Thomas Gleixner's avatar
      ktime: Get rid of ktime_equal() · 1f3a8e49
      Thomas Gleixner authored
      No point in going through loops and hoops instead of just comparing the
      values.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      1f3a8e49
    • Thomas Gleixner's avatar
      ktime: Cleanup ktime_set() usage · 8b0e1953
      Thomas Gleixner authored
      ktime_set(S,N) was required for the timespec storage type and is still
      useful for situations where a Seconds and Nanoseconds part of a time value
      needs to be converted. For anything where the Seconds argument is 0, this
      is pointless and can be replaced with a simple assignment.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      8b0e1953
    • Thomas Gleixner's avatar
      ktime: Get rid of the union · 2456e855
      Thomas Gleixner authored
      ktime is a union because the initial implementation stored the time in
      scalar nanoseconds on 64 bit machine and in a endianess optimized timespec
      variant for 32bit machines. The Y2038 cleanup removed the timespec variant
      and switched everything to scalar nanoseconds. The union remained, but
      become completely pointless.
      
      Get rid of the union and just keep ktime_t as simple typedef of type s64.
      
      The conversion was done with coccinelle and some manual mopping up.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      2456e855
    • Thomas Gleixner's avatar
      clocksource: Use a plain u64 instead of cycle_t · a5a1d1c2
      Thomas Gleixner authored
      There is no point in having an extra type for extra confusion. u64 is
      unambiguous.
      
      Conversion was done with the following coccinelle script:
      
      @rem@
      @@
      -typedef u64 cycle_t;
      
      @fix@
      typedef cycle_t;
      @@
      -cycle_t
      +u64
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: John Stultz <john.stultz@linaro.org>
      a5a1d1c2
    • Thomas Gleixner's avatar
      irqchip/armada-xp: Consolidate hotplug state space · 008b69e4
      Thomas Gleixner authored
      The mpic is either the main interrupt controller or is cascaded behind a
      GIC. The mpic is single instance and the modes are mutually exclusive, so
      there is no reason to have seperate cpu hotplug states.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Cc: Marc Zyngier <marc.zyngier@arm.com>
      Link: http://lkml.kernel.org/r/20161221192112.333161745@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      008b69e4
    • Thomas Gleixner's avatar
      irqchip/gic: Consolidate hotplug state space · 6896bcd1
      Thomas Gleixner authored
      Even if both drivers are compiled in only one instance can run on a given
      system depending on the available GIC version.
      
      So having seperate hotplug states for them is pointless.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Marc Zyngier <marc.zyngier@arm.com>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Link: http://lkml.kernel.org/r/20161221192112.252416267@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      6896bcd1
    • Thomas Gleixner's avatar
      coresight/etm3/4x: Consolidate hotplug state space · 36e5b0e3
      Thomas Gleixner authored
      Even if both drivers are compiled in only one instance can run on a given
      system depending on the available tracer cell.
      
      So having seperate hotplug states for them is pointless.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
      Link: http://lkml.kernel.org/r/20161221192112.162765484@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      36e5b0e3
    • Thomas Gleixner's avatar
      cpu/hotplug: Cleanup state names · 73c1b41e
      Thomas Gleixner authored
      When the state names got added a script was used to add the extra argument
      to the calls. The script basically converted the state constant to a
      string, but the cleanup to convert these strings into meaningful ones did
      not happen.
      
      Replace all the useless strings with 'subsys/xxx/yyy:state' strings which
      are used in all the other places already.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Link: http://lkml.kernel.org/r/20161221192112.085444152@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      73c1b41e
    • Thomas Gleixner's avatar
      cpu/hotplug: Remove obsolete cpu hotplug register/unregister functions · 530e9b76
      Thomas Gleixner authored
      hotcpu_notifier(), cpu_notifier(), __hotcpu_notifier(), __cpu_notifier(),
      register_hotcpu_notifier(), register_cpu_notifier(),
      __register_hotcpu_notifier(), __register_cpu_notifier(),
      unregister_hotcpu_notifier(), unregister_cpu_notifier(),
      __unregister_hotcpu_notifier(), __unregister_cpu_notifier()
      
      are unused now. Remove them and all related code.
      
      Remove also the now pointless cpu notifier error injection mechanism. The
      states can be executed step by step and error rollback is the same as cpu
      down, so any state transition can be tested w/o requiring the notifier
      error injection.
      
      Some CPU hotplug states are kept as they are (ab)used for hotplug state
      tracking.
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: rt@linutronix.de
      Link: http://lkml.kernel.org/r/20161221192112.005642358@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      530e9b76
    • Anna-Maria Gleixner's avatar
      staging/lustre/libcfs: Convert to hotplug state machine · 7b737965
      Anna-Maria Gleixner authored
      Install the callbacks via the state machine. No functional change.
      Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Cc: devel@driverdev.osuosl.org
      Cc: Andreas Dilger <andreas.dilger@intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Oleg Drokin <oleg.drokin@intel.com>
      Cc: rt@linutronix.de
      Cc: lustre-devel@lists.lustre.org
      Link: http://lkml.kernel.org/r/20161202110027.htzzeervzkoc4muv@linutronix.de
      Link: http://lkml.kernel.org/r/20161221192111.922872524@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      7b737965
    • Sebastian Andrzej Siewior's avatar
      scsi/bnx2i: Convert to hotplug state machine · e210faa2
      Sebastian Andrzej Siewior authored
      Install the callbacks via the state machine. No functional change.
      
      This is the minimal fixup so we can remove the hotplug notifier mess
      completely.
      
      The real rework of this driver to use work queues is still stuck in
      review/testing on the SCSI mailing list.
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
      Cc: linux-scsi@vger.kernel.org
      Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Chad Dupuis <chad.dupuis@qlogic.com>
      Cc: QLogic-Storage-Upstream@qlogic.com
      Cc: Johannes Thumshirn <jth@kernel.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Link: http://lkml.kernel.org/r/20161221192111.836895753@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      e210faa2
    • Sebastian Andrzej Siewior's avatar
      scsi/bnx2fc: Convert to hotplug state machine · c53b005d
      Sebastian Andrzej Siewior authored
      Install the callbacks via the state machine. No functional change.
      
      This is the minimal fixup so we can remove the hotplug notifier mess
      completely.
      
      The real rework of this driver to use work queues is still stuck in
      review/testing on the SCSI mailing list.
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
      Cc: linux-scsi@vger.kernel.org
      Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Chad Dupuis <chad.dupuis@qlogic.com>
      Cc: QLogic-Storage-Upstream@qlogic.com
      Cc: Johannes Thumshirn <jth@kernel.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Link: http://lkml.kernel.org/r/20161221192111.757309869@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      c53b005d
    • Thomas Gleixner's avatar
      cpu/hotplug: Prevent overwriting of callbacks · dc280d93
      Thomas Gleixner authored
      Developers manage to overwrite states blindly without thought. That's fatal
      and hard to debug. Add sanity checks to make it fail.
      
      This requries to restructure the code so that the dynamic state allocation
      happens in the same lock protected section as the actual store. Otherwise
      the previous assignment of 'Reserved' to the name field would trigger the
      overwrite check.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Link: http://lkml.kernel.org/r/20161221192111.675234535@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      dc280d93
    • Thomas Gleixner's avatar
      x86/msr: Remove bogus cleanup from the error path · 59fefd08
      Thomas Gleixner authored
      The error cleanup which is invoked when the hotplug state setup failed
      tries to remove the failed state, which is broken.
      
      Fixes: 8fba38c9 ("x86/msr: Convert to hotplug state machine")
      Reported-by: default avatarkernel test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      59fefd08
    • Thomas Gleixner's avatar
      bus: arm-ccn: Prevent hotplug callback leak · 26242b33
      Thomas Gleixner authored
      In case the driver registration fails, the hotplug callback is leaked.
      
      Not fatal, because it's never invoked as there are no instances registered,
      but wrong nevertheless.
      
      Fixes: fdc15a36 ("bus/arm-ccn: Convert to hotplug statemachine")
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Will Deacon <will.deacon@arm.com>
      26242b33
    • Thomas Gleixner's avatar
      perf/x86/intel/cstate: Prevent hotplug callback leak · 834fcd29
      Thomas Gleixner authored
      If the pmu registration fails the registered hotplug callbacks are not
      removed. Wrong in any case, but fatal in case of a modular driver.
      
      Replace the nonsensical state names with proper ones while at it.
      
      Fixes: 77c34ef1 ("perf/x86/intel/cstate: Convert Intel CSTATE to hotplug state machine")
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: stable@vger.kernel.org
      834fcd29
    • Thomas Gleixner's avatar
      ARM/imx/mmcd: Fix broken cpu hotplug handling · a051f220
      Thomas Gleixner authored
      The cpu hotplug support of this perf driver is broken in several ways:
      
      1) It adds a instance before setting up the state.
      
      2) The state for the instance is different from the state of the
         callback. It's just a randomly chosen state.
      
      3) The instance registration is not error checked so nobody noticed that
         the call can never succeed.
      
      4) The state for the multi install callbacks is chosen randomly and
         overwrites existing state. This is now prevented by the core code so the
         call is guaranteed to fail.
      
      5) The error exit path in the init function leaves the instance registered
         and then frees the memory which contains the enqueued hlist node.
      
      6) The remove function is removing the state and not the instance.
      
      Fix it by:
      
      - Setting up the state before adding instances. Use a dynamically allocated
        state for it.
      
      - Installing instances after the state has been set up
      
      - Removing the instance in the error path before freeing memory
      
      - Removing the instance not the state in the driver remove callback
      
      While at is use raw_cpu_processor_id(), because cpu_processor_id() cannot
      be used in preemptible context, and set the driver data after successful
      registration of the pmu.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sebastian Siewior <bigeasy@linutronix.de>
      Cc: Frank Li <frank.li@nxp.com>
      Cc: Zhengyu Shen <zhengyu.shen@nxp.com>
      Link: http://lkml.kernel.org/r/20161221192111.596204211@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      a051f220
    • Thomas Gleixner's avatar
      scsi: qedi: Convert to hotplug state machine · a98d1a0c
      Thomas Gleixner authored
      The CPU hotplug code is a trainwreck. It leaks a notifier in case of driver
      registration error and the per cpu loop is racy against cpu hotplug. Aside
      of that the driver should have been written and merged with the new state
      machine interfaces in the first place.
      
      Mop up the mess and Convert it to the hotplug state machine.
      Signed-off-by: default avatarThomas Grumpy Gleixner <tglx@linutronix.de>
      Cc: Nilesh Javali <nilesh.javali@cavium.com>
      Cc: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com>
      Cc: Chad Dupuis <chad.dupuis@cavium.com>
      Cc: Saurav Kashyap <saurav.kashyap@cavium.com>
      Cc: Arun Easi <arun.easi@cavium.com>
      Cc: Manish Rangankar <manish.rangankar@cavium.com>
      Cc: Johannes Thumshirn <jthumshirn@suse.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: Martin K. Petersen <martin.petersen@oracle.com>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      a98d1a0c
  2. 24 Dec, 2016 10 commits
    • Len Brown's avatar
      tools/power turbostat: remove obsolete -M, -m, -C, -c options · 6886fee4
      Len Brown authored
      The new --add option has replaced the -M, -m, -C, -c options
      Eg.
      
      -M 0x10 is now --add msr0x10,raw
      -m 0x10 is now --add msr0x10,raw,u32
      -C 0x10 is now --add msr0x10,delta
      -c 0x10 is now --add msr0x10,delta,u32
      
      The --add option can be repeated to add any number of counters,
      while the previous options were limited to adding one of each type.
      
      In addition, the --add option can accept a column label,
      and can also display a counter as a percentage of elapsed cycles.
      
      Eg. --add msr0x3fe,core,percent,MY_CC3
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      6886fee4
    • Len Brown's avatar
      tools/power turbostat: Make extensible via the --add parameter · 388e9c81
      Len Brown authored
      Create the "--add" parameter.  This can be used to teach an existing
      turbostat binary about any number of any type of counter.
      
      turbostat(8) details the syntax for --add.
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      388e9c81
    • Linus Torvalds's avatar
      Replace <asm/uaccess.h> with <linux/uaccess.h> globally · 7c0f6ba6
      Linus Torvalds authored
      This was entirely automated, using the script by Al:
      
        PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
        sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
              $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h)
      
      to do the replacement at the end of the merge window.
      Requested-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7c0f6ba6
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 1dd5c6b1
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "This ncludes various cifs/smb3 bug fixes, mostly for stable as well.
      
        In the next week I expect that Germano will have some reconnection
        fixes, and also I expect to have the remaining pieces of the snapshot
        enablement and SMB3 ACLs, but wanted to get this set of bug fixes in"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs_get_root shouldn't use path with tree name
        Fix default behaviour for empty domains and add domainauto option
        cifs: use %16phN for formatting md5 sum
        cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack
        CIFS: Fix a possible double locking of mutex during reconnect
        CIFS: Fix a possible memory corruption during reconnect
        CIFS: Fix a possible memory corruption in push locks
        CIFS: Fix missing nls unload in smb2_reconnect()
        CIFS: Decrease verbosity of ioctl call
        SMB3: parsing for new snapshot timestamp mount parm
      1dd5c6b1
    • Linus Torvalds's avatar
      Merge tag 'watchdog-for-linus-v4.10' of... · 3a77fa85
      Linus Torvalds authored
      Merge tag 'watchdog-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull watchdog updates from Wim Van Sebroeck and Guenter Roeck:
      
       - new driver for Add Loongson1 SoC
      
       - minor cleanup and fixes in various drivers
      
      * tag 'watchdog-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        watchdog: it87_wdt: add IT8620E ID
        watchdog: mpc8xxx: Remove unneeded linux/miscdevice.h include
        watchdog: octeon: Remove unneeded linux/miscdevice.h include
        watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when appropriate
        watchdog: loongson1: Add Loongson1 SoC watchdog driver
        watchdog: cpwd: remove memory allocate failure message
        watchdog: da9062/61: watchdog driver
        intel-mid_wdt: Error code is just an integer
        intel-mid_wdt: make sure watchdog is not running at startup
        watchdog: mei_wdt: request stop on reboot to prevent false positive event
        watchdog: hpwdt: changed maintainer information
        watchdog: jz4740: Fix modular build
        watchdog: qcom: fix kernel panic due to external abort on non-linefetch
        watchdog: davinci: add support for deferred probing
        watchdog: meson: Remove unneeded platform MODULE_ALIAS
        watchdog: Standardize leading tabs and spaces in Kconfig file
        watchdog: max77620_wdt: fix module autoload
        watchdog: bcm7038_wdt: fix module autoload
      3a77fa85
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.10' of git://github.com/jonmason/ntb · 01e0d603
      Linus Torvalds authored
      Pull NTB update from Jon Mason:
      
       - NTB bug fixes for removing an unnecessary call to ntb_peer_spad_read,
         and correcting a free_irq inconsistency
      
       - add Intel SKX support
      
       - change the AMD NTB maintainer, and fix some bugs present there
      
      * tag 'ntb-4.10' of git://github.com/jonmason/ntb:
        ntb_transport: Remove unnecessary call to ntb_peer_spad_read
        NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy
        ntb: fix SKX NTB config space size register offsets
        NTB: correct ntb_peer_spad_read for case when callback is not supplied.
        MAINTAINERS: Change in maintainer for AMD NTB
        ntb_transport: Limit memory windows based on available, scratchpads
        NTB: Register and offset values fix for memory window
        NTB: add support for hotplug feature
        ntb: Adding Skylake Xeon NTB support
      01e0d603
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6ac3bb16
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "There's a number of fixes:
      
         - a round of fixes for CPUID-less legacy CPUs
         - a number of microcode loader fixes
         - i8042 detection robustization fixes
         - stack dump/unwinder fixes
         - x86 SoC platform driver fixes
         - a GCC 7 warning fix
         - virtualization related fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        Revert "x86/unwind: Detect bad stack return address"
        x86/paravirt: Mark unused patch_default label
        x86/microcode/AMD: Reload proper initrd start address
        x86/platform/intel/quark: Add printf attribute to imr_self_test_result()
        x86/platform/intel-mid: Switch MPU3050 driver to IIO
        x86/alternatives: Do not use sync_core() to serialize I$
        x86/topology: Document cpu_llc_id
        x86/hyperv: Handle unknown NMIs on one CPU when unknown_nmi_panic
        x86/asm: Rewrite sync_core() to use IRET-to-self
        x86/microcode/intel: Replace sync_core() with native_cpuid()
        Revert "x86/boot: Fail the boot if !M486 and CPUID is missing"
        x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels
        x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
        x86/tools: Fix gcc-7 warning in relocs.c
        x86/unwind: Dump stack data on warnings
        x86/unwind: Adjust last frame check for aligned function stacks
        x86/init: Fix a couple of comment typos
        x86/init: Remove i8042_detect() from platform ops
        Input: i8042 - Trust firmware a bit more when probing on X86
        x86/init: Add i8042 state to the platform data
        ...
      6ac3bb16
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · eb3e8d9d
      Linus Torvalds authored
      Pull timer fix from Ingo Molnar:
       "ARM/MOXA SoC clocksource driver fixes"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource/drivers/moxart: Plug memory and mapping leaks
      eb3e8d9d
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 00198dab
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "On the kernel side there's two x86 PMU driver fixes and a uprobes fix,
        plus on the tooling side there's a number of fixes and some late
        updates"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        perf sched timehist: Fix invalid period calculation
        perf sched timehist: Remove hardcoded 'comm_width' check at print_summary
        perf sched timehist: Enlarge default 'comm_width'
        perf sched timehist: Honour 'comm_width' when aligning the headers
        perf/x86: Fix overlap counter scheduling bug
        perf/x86/pebs: Fix handling of PEBS buffer overflows
        samples/bpf: Move open_raw_sock to separate header
        samples/bpf: Remove perf_event_open() declaration
        samples/bpf: Be consistent with bpf_load_program bpf_insn parameter
        tools lib bpf: Add bpf_prog_{attach,detach}
        samples/bpf: Switch over to libbpf
        perf diff: Do not overwrite valid build id
        perf annotate: Don't throw error for zero length symbols
        perf bench futex: Fix lock-pi help string
        perf trace: Check if MAP_32BIT is defined (again)
        samples/bpf: Make perf_event_read() static
        uprobes: Fix uprobes on MIPS, allow for a cache flush after ixol breakpoint creation
        samples/bpf: Make samples more libbpf-centric
        tools lib bpf: Add flags to bpf_create_map()
        tools lib bpf: use __u32 from linux/types.h
        ...
      00198dab
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9004fda5
      Linus Torvalds authored
      Pull irq fix from Ingo Molnar:
       "A build warning fix with certain .config's"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/st: Mark st_irq_syscfg_resume() __maybe_unused
      9004fda5
  3. 23 Dec, 2016 7 commits