1. 22 2月, 2015 15 次提交
    • L
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · b5ccb078
      Linus Torvalds 提交于
      Pull InfiniBand/RDMA updates from Roland Dreier:
       - Re-enable on-demand paging changes with stable ABI
       - Fairly large set of ocrdma HW driver fixes
       - Some qib HW driver fixes
       - Other miscellaneous changes
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (43 commits)
        IB/qib: Add blank line after declaration
        IB/qib: Fix checkpatch warnings
        IB/mlx5: Enable the ODP capability query verb
        IB/core: Add on demand paging caps to ib_uverbs_ex_query_device
        IB/core: Add support for extended query device caps
        RDMA/cxgb4: Don't hang threads forever waiting on WR replies
        RDMA/ocrdma: Fix off by one in ocrdma_query_gid()
        RDMA/ocrdma: Use unsigned for bit index
        RDMA/ocrdma: Help gcc generate better code for ocrdma_srq_toggle_bit
        RDMA/ocrdma: Update the ocrdma module version string
        RDMA/ocrdma: set vlan present bit for user AH
        RDMA/ocrdma: remove reference of ocrdma_dev out of ocrdma_qp structure
        RDMA/ocrdma: Add support for interrupt moderation
        RDMA/ocrdma: Honor return value of ocrdma_resolve_dmac
        RDMA/ocrdma: Allow expansion of the SQ CQEs via buddy CQ expansion of the QP
        RDMA/ocrdma: Discontinue support of RDMA-READ-WITH-INVALIDATE
        RDMA/ocrdma: Host crash on destroying device resources
        RDMA/ocrdma: Report correct state in ibv_query_qp
        RDMA/ocrdma: Debugfs enhancments for ocrdma driver
        RDMA/ocrdma: Report correct count of interrupt vectors while registering ocrdma device
        ...
      b5ccb078
    • L
      Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 29532455
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       "Summary:
      
         - legacy PM code removed from the core, there were no users anymore
           (thanks to Lars-Peter Clausen)
      
         - new driver for Broadcom iProc
      
         - bigger driver updates for designware, rk3x, cadence, ocores
      
         - a bunch of smaller updates and bugfixes"
      
      * 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (31 commits)
        i2c: ocores: rework clk code to handle NULL cookie
        i2c: designware-baytrail: another fixup for proper Kconfig dependencies
        i2c: fix reference to functionality constants definition
        i2c: iproc: Add Broadcom iProc I2C Driver
        i2c: designware-pci: update Intel copyright line
        i2c: ocores: add common clock support
        i2c: hix5hd2: add COMPILE_TEST
        i2c: clarify comments about the dev_released completion
        i2c: ocores: fix clock-frequency binding usage
        i2c: tegra: Maintain CPU endianness
        i2c: designware-baytrail: use proper Kconfig dependencies
        i2c: designware: Do not calculate SCL timing parameters needlessly
        i2c: do not try to load modules for of-registered devices
        i2c: designware: Add Intel Baytrail PMIC I2C bus support
        i2c: designware: Add i2c bus locking support
        of: i2c: Add i2c-mux-idle-disconnect DT property to PCA954x mux driver
        i2c: designware: use {readl|writel}_relaxed instead of readl/writel
        i2c: designware-pci: no need to provide clk_khz
        i2c: designware-pci: remove Moorestown support
        i2c: imx: whitespace and checkpatch cleanup
        ...
      29532455
    • L
      Merge tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux · 18a8d499
      Linus Torvalds 提交于
      Pull clock framework updates from Mike Turquette:
       "The clock framework changes contain the usual driver additions,
        enhancements and fixes mostly for ARM32, ARM64, MIPS and Power-based
        devices.
      
        Additionally the framework core underwent a bit of surgery with two
        major changes:
      
         - The boundary between the clock core and clock providers (e.g clock
           drivers) is now more well defined with dedicated provider helper
           functions.  struct clk no longer maps 1:1 with the hardware clock
           but is a true per-user cookie which helps us tracker users of
           hardware clocks and debug bad behavior.
      
         - The addition of rate constraints for clocks.  Rate ranges are now
           supported which are analogous to the voltage ranges in the
           regulator framework.
      
        Unfortunately these changes to the core created some breakeage.  We
        think we fixed it all up but for this reason there are lots of last
        minute commits trying to undo the damage"
      
      * tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux: (113 commits)
        clk: Only recalculate the rate if needed
        Revert "clk: mxs: Fix invalid 32-bit access to frac registers"
        clk: qoriq: Add support for the platform PLL
        powerpc/corenet: Enable CLK_QORIQ
        clk: Replace explicit clk assignment with __clk_hw_set_clk
        clk: Add __clk_hw_set_clk helper function
        clk: Don't dereference parent clock if is NULL
        MIPS: Alchemy: Remove bogus args from alchemy_clk_fgcs_detr
        clkdev: Always allocate a struct clk and call __clk_get() w/ CCF
        clk: shmobile: div6: Avoid division by zero in .round_rate()
        clk: mxs: Fix invalid 32-bit access to frac registers
        clk: omap: compile legacy omap3 clocks conditionally
        clkdev: Export clk_register_clkdev
        clk: Add rate constraints to clocks
        clk: remove clk-private.h
        pci: xgene: do not use clk-private.h
        arm: omap2+ remove dead clock code
        clk: Make clk API return per-user struct clk instances
        clk: tegra: Define PLLD_DSI and remove dsia(b)_mux
        clk: tegra: Add support for the Tegra132 CAR IP block
        ...
      18a8d499
    • L
      Merge tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio · c189cb8e
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - IOMMU updates based on trace analysis
       - VFIO device request interface
      
      * tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio:
        vfio-pci: Add device request interface
        vfio-pci: Generalize setup of simple eventfds
        vfio: Add and use device request op for vfio bus drivers
        vfio: Tie IOMMU group reference to vfio group
        vfio: Add device tracking during unbind
        vfio/type1: Add conditional rescheduling
        vfio/type1: Chunk contiguous reserved/invalid page mappings
        vfio/type1: DMA unmap chunking
      c189cb8e
    • L
      Merge tag 'sound-fix-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a2a6937d
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Here are a few small fix patches for 3.20-rc1:
      
         - Quirks for Denon and Lifecam USB-audio devices and HD-audio on HP
           laptops
         - A long-time regression fix for HDSP eMADI
         - Add missing DRAIN_TRIGGER flag set for ASoC intel-sst
         - Trivial fixes for sequencer core and HD-audio Tegra, a LINE6
           cleanup"
      
      * tag 'sound-fix-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)
        ASoC: Intel: add SNDRV_PCM_INFO_DRAIN_TRIGGER flag
        ALSA: usb-audio: Don't attempt to get Lifecam HD-5000 sample rate
        ALSA: hda/tegra check correct return value from ioremap_resource
        ALSA: hdspm - Constrain periods to 2 on older cards
        ALSA: hda - enable mute led quirk for one more hp machine.
        ALSA: seq: potential out of bounds in do_control()
        ALSA: line6: Improve line6_read/write_data() interfaces
      a2a6937d
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · f5e25f0d
      Linus Torvalds 提交于
      Pull thermal management fix from Zhang Rui:
       "One patch to fix a problem that all Exynos SoCs will break at boot
        time"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: exynos: fix: Check if data->tmu_read callback is present before read
      f5e25f0d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · d34696c2
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "Two patches to save some memory if CONFIG_NR_CPUS is large, a changed
        default for the use of compare-and-delay, and a couple of bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/spinlock: disabled compare-and-delay by default
        s390/mm: align 64-bit PIE binaries to 4GB
        s390/cacheinfo: coding style changes
        s390/cacheinfo: fix shared cpu masks
        s390/smp: reduce size of struct pcpu
        s390/topology: convert cpu_topology array to per cpu variable
        s390/topology: delay initialization of topology cpu masks
        s390/vdso: fix clock_gettime for CLOCK_THREAD_CPUTIME_ID, -2 and -3
      d34696c2
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f9677375
      Linus Torvalds 提交于
      Pull Intel Quark SoC support from Ingo Molnar:
       "This adds support for Intel Quark X1000 SoC boards, used in the low
        power 32-bit x86 Intel Galileo microcontroller board intended for the
        Arduino space.
      
        There's been some preparatory core x86 patches for Quark CPU quirks
        merged already, but this rounds it all up and adds Kconfig enablement.
        It's a clean hardware enablement addition tree at this point"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel/quark: Fix simple_return.cocci warnings
        x86/intel/quark: Fix ptr_ret.cocci warnings
        x86/intel/quark: Add Intel Quark platform support
        x86/intel/quark: Add Isolated Memory Regions for Quark X1000
      f9677375
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f3c233d7
      Linus Torvalds 提交于
      Pull ntp fix from Ingo Molnar:
       "An adjtimex interface regression fix for 32-bit systems"
      
      [ A check that was added in a previous commit is really only a concern
        for 64bit systems, but was applied to both 32 and 64bit systems, which
        results in breaking 32bit systems.
      
        Thus the fix here is to make the check only apply to 64bit systems ]
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ntp: Fixup adjtimex freq validation on 32-bit systems
      f3c233d7
    • L
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 10436cf8
      Linus Torvalds 提交于
      Pull locking fixes from Ingo Molnar:
       "Two fixes: the paravirt spin_unlock() corruption/crash fix, and an
        rtmutex NULL dereference crash fix"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/spinlocks/paravirt: Fix memory corruption on unlock
        locking/rtmutex: Avoid a NULL pointer dereference on deadlock
      10436cf8
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5fbe4c22
      Linus Torvalds 提交于
      Pull misc x86 fixes from Ingo Molnar:
       "This contains:
      
         - EFI fixes
         - a boot printout fix
         - ASLR/kASLR fixes
         - intel microcode driver fixes
         - other misc fixes
      
        Most of the linecount comes from an EFI revert"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
        x86/microcode/intel: Handle truncated microcode images more robustly
        x86/microcode/intel: Guard against stack overflow in the loader
        x86, mm/ASLR: Fix stack randomization on 64-bit systems
        x86/mm/init: Fix incorrect page size in init_memory_mapping() printks
        x86/mm/ASLR: Propagate base load address calculation
        Documentation/x86: Fix path in zero-page.txt
        x86/apic: Fix the devicetree build in certain configs
        Revert "efi/libstub: Call get_memory_map() to obtain map and desc sizes"
        x86/efi: Avoid triple faults during EFI mixed mode calls
      5fbe4c22
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e2defd02
      Linus Torvalds 提交于
      Pull scheduler fixes from Ingo Molnar:
       "Thiscontains misc fixes: preempt_schedule_common() and io_schedule()
        recursion fixes, sched/dl fixes, a completion_done() revert, two
        sched/rt fixes and a comment update patch"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/rt: Avoid obvious configuration fail
        sched/autogroup: Fix failure to set cpu.rt_runtime_us
        sched/dl: Do update_rq_clock() in yield_task_dl()
        sched: Prevent recursion in io_schedule()
        sched/completion: Serialize completion_done() with complete()
        sched: Fix preempt_schedule_common() triggering tracing recursion
        sched/dl: Prevent enqueue of a sleeping task in dl_task_timer()
        sched: Make dl_task_time() use task_rq_lock()
        sched: Clarify ordering between task_rq_lock() and move_queued_task()
      e2defd02
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b5aeca54
      Linus Torvalds 提交于
      Pull x86 uprobe/kprobe fixes from Ingo Molnar:
       "This contains two uprobes fixes, an uprobes comment update and a
        kprobes fix"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        kprobes/x86: Mark 2 bytes NOP as boostable
        uprobes/x86: Fix 2-byte opcode table
        uprobes/x86: Fix 1-byte opcode tables
        uprobes/x86: Add comment with insn opcodes, mnemonics and why we dont support them
      b5aeca54
    • L
      Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of... · 3f4d9925
      Linus Torvalds 提交于
      Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull rcu fix and x86 irq fix from Ingo Molnar:
      
       - Fix a bug that caused an RCU warning splat.
      
       - Two x86 irq related fixes: a hotplug crash fix and an ACPI IRQ
         registry fix.
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rcu: Clear need_qs flag to prevent splat
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Check for valid irq descriptor in check_irq_vectors_for_cpu_disable()
        x86/irq: Fix regression caused by commit b568b860
      3f4d9925
    • L
      kernel: make READ_ONCE() valid on const arguments · dd369297
      Linus Torvalds 提交于
      The use of READ_ONCE() causes lots of warnings witht he pending paravirt
      spinlock fixes, because those ends up having passing a member to a
      'const' structure to READ_ONCE().
      
      There should certainly be nothing wrong with using READ_ONCE() with a
      const source, but the helper function __read_once_size() would cause
      warnings because it would drop the 'const' qualifier, but also because
      the destination would be marked 'const' too due to the use of 'typeof'.
      
      Use a union of types in READ_ONCE() to avoid this issue.
      
      Also make sure to use parenthesis around the macro arguments to avoid
      possible operator precedence issues.
      Tested-by: NIngo Molnar <mingo@kernel.org>
      Cc: Christian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dd369297
  2. 21 2月, 2015 6 次提交
  3. 20 2月, 2015 19 次提交
    • L
      thermal: exynos: fix: Check if data->tmu_read callback is present before read · 4531fa16
      Lukasz Majewski 提交于
      The exynos_tmu_data() function should on entrance test not only for valid
      data pointer, but also for data->tmu_read one.
      It is important, since afterwards it is dereferenced to get temperature code.
      Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
      Tested-by: NAbhilash Kesavan <a.kesavan@samsung.com>
      Signed-off-by: NZhang Rui <rui.zhang@intel.com>
      4531fa16
    • J
      x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch · 570e1aa8
      Jiri Kosina 提交于
      Commit f47233c2 ("x86/mm/ASLR: Propagate base load address
      calculation") causes PAGE_SIZE redefinition warnings for UML
      subarch  builds. This is caused by added includes that were
      leftovers from previous  patch versions are are not actually
      needed (especially page_types.h  inlcude in module.c). Drop
      those stray includes.
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: H. Peter Anvin <hpa@linux.intel.com>
      Cc: Kees Cook <keescook@chromium.org>
      Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1502201017240.28769@pobox.suse.czSigned-off-by: NIngo Molnar <mingo@kernel.org>
      570e1aa8
    • T
      clk: Only recalculate the rate if needed · ec02ace8
      Tomeu Vizoso 提交于
      We don't really need to recalculate the effective rate of a clock when a
      per-user clock is removed, if the constraints of the later aren't
      limiting the requested rate.
      
      This was causing problems with clocks that never had a rate set before,
      as rate_req would be zero. Though this could be considered a bug in the
      implementation of those clocks, this should be checked somewhere else.
      
      Fixes: 1c8e6004 ("clk: Add rate constraints to clocks")
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
      Signed-off-by: NTomeu Vizoso <tomeu.vizoso@collabora.com>
      Signed-off-by: NMichael Turquette <mturquette@linaro.org>
      ec02ace8
    • C
      ipmi: Fix a memory ordering issue · 1d86e29b
      Corey Minyard 提交于
      From a locking point of view it is safe to check waiting_msg without
      a lock, but there is a memory ordering issue that causes it to
      possibly not be set right when viewed from another processor.  We are
      already claiming a lock right after that, move the check to inside
      the lock to enforce the memory ordering.
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      1d86e29b
    • J
      ipmi: Remove uses of return value of seq_printf · d6c5dc18
      Joe Perches 提交于
      The seq_printf like functions will soon be changed to return void.
      
      Convert these uses to check seq_has_overflowed instead.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      d6c5dc18
    • T
      ipmi: Use is_visible callback for conditional sysfs entries · 2d06a0c9
      Takashi Iwai 提交于
      Instead of manual calls of device_create_file() and
      device_remove_file(), implement the condition in is_visible callback
      for the attribute group and put these entries to the group, too.
      This simplifies the code and avoids the possible races.
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      2d06a0c9
    • N
      ipmi: Free ipmi_recv_msg messages from the linked list on close · bdf2829c
      Nicholas Krause 提交于
      This adds a loop through the elements in the linked list, recv_msgs using
      list_for_entry_safe in order to free messages in this list.  In addition
      we are using the safe version of this marco in order to prevent use after
      bugs related to deleting the element we are on currently by holding a
      pointer to the next element after the current one we are on and freeing
      with the function, ipmi_free_recv_msg internally in this loop.
      Signed-off-by: NNicholas Krause <xerofoify@gmail.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      bdf2829c
    • A
      ipmi: avoid gcc warning · 191cc414
      Arnd Bergmann 提交于
      A new harmless warning has come up on ARM builds with gcc-4.9:
      
      drivers/char/ipmi/ipmi_msghandler.c: In function 'smi_send.isra.11':
      include/linux/spinlock.h:372:95: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized]
        raw_spin_unlock_irqrestore(&lock->rlock, flags);
                                                                                                     ^
      drivers/char/ipmi/ipmi_msghandler.c:1490:16: note: 'flags' was declared here
        unsigned long flags;
                      ^
      
      This could be worked around by initializing the 'flags' variable, but it
      seems better to rework the code to avoid this.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 7ea0ed2b ("ipmi: Make the message handler easier to use for SMI interfaces")
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      191cc414
    • J
      ipmi: Update timespec usage to timespec64 · 48862ea2
      John Stultz 提交于
      As part of the internal y2038 cleanup, this patch removes
      timespec usage in the ipmi driver, replacing it timespec64
      
      Cc: openipmi-developer@lists.sourceforge.net
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      Signed-off-by: NCorey Minyard <minyard@mvista.com>
      48862ea2
    • J
      ipmi: Cleanup DEBUG_TIMING ifdef usage · f93aae9f
      John Stultz 提交于
      The driver uses #ifdef DEBUG_TIMING in order to conditionally print out
      timestamped debug messages. Unfortunately it adds the ifdefs all over the
      usage sites.
      
      This patch cleans it up by adding a debug_timestamp() function which
      is compiled out if DEBUG_TIMING isn't present. This cleans up all
      the ugly ifdefs in the function logic.
      
      Cc: openipmi-developer@lists.sourceforge.net
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      Signed-off-by: NCorey Minyard <minyard@mvista.com>
      f93aae9f
    • N
      drivers:char:ipmi: Remove unneeded FIXME comment in the file,ipmi_si_intf.c · 31013fa9
      Nicholas Krause 提交于
      Removes a no longer needed FIXME comment in the function,acpi_gpe_irq_setup
      for the file,ipmi_si_intf.c. This comment is no longer needed as clearly we
      are passing the correct level of  ACPI_GPE_LEVEL_TRIGGERED to the installer
      function,acpi_install_gpe_handler due to no breakage after years of using
      this ACPI level in the function,acpi_install_gpe_handler.
      Signed-off-by: NNicholas Krause <xerofoify@gmail.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      31013fa9
    • W
      char: ipmi: Remove obsolete cleanup for clientdata · bb82d90e
      Wolfram Sang 提交于
      A few new i2c-drivers came into the kernel which clear the clientdata-pointer
      on exit or error. This is obsolete meanwhile, the core will do it.
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      bb82d90e
    • C
      ipmi: Remove a FIXME for slab conversion · 2fcaf60c
      Corey Minyard 提交于
      There can't be more than a few IPMI messages allocated at any one time,
      so converting the messages to slabs would be a waste.  So just remove
      the FIXME.
      Suggested-by: NNicholas Krause <xerofoify@gmail.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      2fcaf60c
    • L
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · 3d883483
      Linus Torvalds 提交于
      Pull more thermal managament updates from Zhang Rui:
       "Specifics:
      
         - Exynos thermal driver refactoring.  Several cleanups, code
           optimization, unused symbols removal, and unused feature removal in
           Exynos thermal driver.  Thanks Lukasz for this effort.
      
         - Exynos thermal driver support to OF thermal.  After the code
           refactoring, the driver earned the support to OF thermal.  Chip
           thermal data were moved from driver code to DTS, reducing the code
           footprint.  Thanks Lukasz for this.
      
         - After receiving the OF thermal support, the exynos thermal driver
           now must allow modular build.  Thanks Arnd for detecting, reporting
           and fixing this.
      
         - Exynos thermal driver support to Exynos 7 SoC.  Thanks Abhilash for
           this.
      
         - Accurate temperature reporting on Rockchip thermal driver, thanks
           to Caesar.
      
         - Fix on how OF thermal enables its zones, thanks Lukasz for fixing.
      
         - Fixes in OF thermal examples under Documentation/.  Thanks Srinivas
           for fixing"
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: exynos: Add TMU support for Exynos7 SoC
        dts: Documentation: Add documentation for Exynos7 SoC thermal bindings
        cpufreq: exynos: allow modular build
        thermal: Fix examples in DT documentation
        thermal: exynos: Correct sanity check at exynos_report_trigger() function
        thermal: Kconfig: Remove config for not used EXYNOS_THERMAL_CORE
        thermal: exynos: Remove exynos_tmu_data.c file
        thermal: rockchip: make temperature reporting much more accurate
        thermal: exynos: Remove exynos_thermal_common.[c|h] files
        thermal: samsung: core: Exynos TMU rework to use device tree for configuration
        dts: Documentation: Update exynos-thermal.txt example for Exynos5440
        dts: Documentation: Extending documentation entry for exynos-thermal
        cpufreq: exynos: Use device tree to determine if cpufreq cooling should be registered
        thermal: exynos: Modify exynos thermal code to use device tree for cpu cooling configuration
        thermal: exynos: Provide thermal_exynos.h file to be included in device tree files
        thermal: exynos: cosmetic: Correct comment format
        thermal: of: Enable thermal_zoneX when sensor is correctly added
      3d883483
    • D
      x86: pte_protnone() and pmd_protnone() must check entry is not present · e3a1f6ca
      David Vrabel 提交于
      Since _PAGE_PROTNONE aliases _PAGE_GLOBAL it is only valid if
      _PAGE_PRESENT is clear.  Make pte_protnone() and pmd_protnone() check
      for this.
      
      This fixes a 64-bit Xen PV guest regression introduced by 8a0516ed
      ("mm: convert p[te|md]_numa users to p[te|md]_protnone_numa").  Any
      userspace process would endlessly fault.
      
      In a 64-bit PV guest, userspace page table entries have _PAGE_GLOBAL set
      by the hypervisor.  This meant that any fault on a present userspace
      entry (e.g., a write to a read-only mapping) would be misinterpreted as
      a NUMA hinting fault and the fault would not be correctly handled,
      resulting in the access endlessly faulting.
      Signed-off-by: NDavid Vrabel <david.vrabel@citrix.com>
      Acked-by: NMel Gorman <mgorman@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e3a1f6ca
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 2b9fb532
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "This pull is mostly cleanups and fixes:
      
         - The raid5/6 cleanups from Zhao Lei fixup some long standing warts
           in the code and add improvements on top of the scrubbing support
           from 3.19.
      
         - Josef has round one of our ENOSPC fixes coming from large btrfs
           clusters here at FB.
      
         - Dave Sterba continues a long series of cleanups (thanks Dave), and
           Filipe continues hammering on corner cases in fsync and others
      
        This all was held up a little trying to track down a use-after-free in
        btrfs raid5/6.  It's not clear yet if this is just made easier to
        trigger with this pull or if its a new bug from the raid5/6 cleanups.
        Dave Sterba is the only one to trigger it so far, but he has a
        consistent way to reproduce, so we'll get it nailed shortly"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (68 commits)
        Btrfs: don't remove extents and xattrs when logging new names
        Btrfs: fix fsync data loss after adding hard link to inode
        Btrfs: fix BUG_ON in btrfs_orphan_add() when delete unused block group
        Btrfs: account for large extents with enospc
        Btrfs: don't set and clear delalloc for O_DIRECT writes
        Btrfs: only adjust outstanding_extents when we do a short write
        btrfs: Fix out-of-space bug
        Btrfs: scrub, fix sleep in atomic context
        Btrfs: fix scheduler warning when syncing log
        Btrfs: Remove unnecessary placeholder in btrfs_err_code
        btrfs: cleanup init for list in free-space-cache
        btrfs: delete chunk allocation attemp when setting block group ro
        btrfs: clear bio reference after submit_one_bio()
        Btrfs: fix scrub race leading to use-after-free
        Btrfs: add missing cleanup on sysfs init failure
        Btrfs: fix race between transaction commit and empty block group removal
        btrfs: add more checks to btrfs_read_sys_array
        btrfs: cleanup, rename a few variables in btrfs_read_sys_array
        btrfs: add checks for sys_chunk_array sizes
        btrfs: more superblock checks, lower bounds on devices and sectorsize/nodesize
        ...
      2b9fb532
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 4533f6e2
      Linus Torvalds 提交于
      Pull Ceph changes from Sage Weil:
       "On the RBD side, there is a conversion to blk-mq from Christoph,
        several long-standing bug fixes from Ilya, and some cleanup from
        Rickard Strandqvist.
      
        On the CephFS side there is a long list of fixes from Zheng, including
        improved session handling, a few IO path fixes, some dcache management
        correctness fixes, and several blocking while !TASK_RUNNING fixes.
      
        The core code gets a few cleanups and Chaitanya has added support for
        TCP_NODELAY (which has been used on the server side for ages but we
        somehow missed on the kernel client).
      
        There is also an update to MAINTAINERS to fix up some email addresses
        and reflect that Ilya and Zheng are doing most of the maintenance for
        RBD and CephFS these days.  Do not be surprised to see a pull request
        come from one of them in the future if I am unavailable for some
        reason"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
        MAINTAINERS: update Ceph and RBD maintainers
        libceph: kfree() in put_osd() shouldn't depend on authorizer
        libceph: fix double __remove_osd() problem
        rbd: convert to blk-mq
        ceph: return error for traceless reply race
        ceph: fix dentry leaks
        ceph: re-send requests when MDS enters reconnecting stage
        ceph: show nocephx_require_signatures and notcp_nodelay options
        libceph: tcp_nodelay support
        rbd: do not treat standalone as flatten
        ceph: fix atomic_open snapdir
        ceph: properly mark empty directory as complete
        client: include kernel version in client metadata
        ceph: provide seperate {inode,file}_operations for snapdir
        ceph: fix request time stamp encoding
        ceph: fix reading inline data when i_size > PAGE_SIZE
        ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions)
        ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps)
        ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_sync)
        rbd: fix error paths in rbd_dev_refresh()
        ...
      4533f6e2
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 89d3fa45
      Linus Torvalds 提交于
      Pull thermal managament updates from Zhang Rui:
       "Specifics:
      
         - Abstract the code and introduce helper functions for all int340x
           thermal drivers.  From: Srinivas Pandruvada.
      
         - Reorganize the ACPI LPAT table support code so that it can be
           shared for both ACPI PMIC driver and int340x thermal driver.
      
         - Add support for Braswell in intel_soc_dts thermal driver.
      
         - a couple of small fixes/cleanups for step_wise governor and int340x
           thermal driver"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        Thermal/int340x_thermal: remove unused uuids.
        thermal: step_wise: spelling fixes
        thermal: int340x: fix sparse warning
        Thermal/int340x: LPAT conversion for temperature
        ACPI / PMIC: Use common LPAT table handling functions
        ACPI / LPAT: Common table processing functions
        thermal: Intel SoC DTS: Add Braswell support
        Thermal/int340x/int3402: Provide notification support
        Thermal/int340x/processor_thermal: Add thermal zone support
        Thermal/int340x/int3403: Use int340x thermal API
        Thermal/int340x/int3402: Use int340x thermal API
        Thermal/int340x: Add common thermal zone handler
      89d3fa45
    • L
      Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 477ea116
      Linus Torvalds 提交于
      Pull two EDAC fixes from Borislav Petkov:
      
       - A fix to sb_edac for proper detection on SNB machines
      
       - A fix to amd64_edac to not explode on Numascale machines with more
         than 16 memory controllers, from Daniel J Blueman.
      
      * tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, amd64_edac: Prevent OOPS with >16 memory controllers
        sb_edac: Fix detection on SNB machines
      477ea116