1. 12 7月, 2014 5 次提交
  2. 11 7月, 2014 33 次提交
    • A
      powerpc/perf: Never program book3s PMCs with values >= 0x80000000 · f5602941
      Anton Blanchard 提交于
      We are seeing a lot of PMU warnings on POWER8:
      
          Can't find PMC that caused IRQ
      
      Looking closer, the active PMC is 0 at this point and we took a PMU
      exception on the transition from negative to 0. Some versions of POWER8
      have an issue where they edge detect and not level detect PMC overflows.
      
      A number of places program the PMC with (0x80000000 - period_left),
      where period_left can be negative. We can either fix all of these or
      just ensure that period_left is always >= 1.
      
      This patch takes the second option.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAnton Blanchard <anton@samba.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      f5602941
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 85d90fae
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too scary, we have one outstanding i915 regression but Daniel
        has promised the fix as soon as he's finished testing it a bit.
      
        Fixes for the main x86 drivers:
         - radeon: dpm fixes, displayport regression fix
         - i915: quirks for backlight regression, edp reboot fix, valleyview
           black screen fixes
         - nouveau: display port regression fixes, fix for memory reclocking"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon/dpm: Reenabling SS on Cayman
        drm/radeon: fix typo in ci_stop_dpm()
        drm/radeon: fix typo in golden register setup on evergreen
        drm/radeon: only print meaningful VM faults
        drm/radeon/dp: return -EIO for flags not zero case
        drm/i915/vlv: T12 eDP panel timing enforcement during reboot
        drm/i915: Only unbind vgacon, not other console drivers
        drm/i915: Don't clobber the GTT when it's within stolen memory
        drm/i915/vlv: Update the DSI ULPS entry/exit sequence
        drm/i915/vlv: DPI FIFO empty check is not needed
        drm/i915: Toshiba CB35 has a controllable backlight
        drm/i915: Acer C720 and C720P have controllable backlights
        drm/i915: quirk asserts controllable backlight presence, overriding VBT
        drm/nouveau/ram: fix test for gpio presence
        drm/nouveau/dp: workaround broken display
        drm/nouveau/dp: fix required link bandwidth calculations
        drm/nouveau/kms: restore fbcon after display has been resumed
        drm/nv50-/kms: pass a non-zero value for head to sor dpms methods
        drm/nouveau/fb: Prevent inlining of ramfuc_reg
        drm/gk104/ram: bash mpll bit 31 on
      85d90fae
    • G
      powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64 · fb43e847
      Guenter Roeck 提交于
      powerpc:allmodconfig has been failing for some time with the following
      error.
      
      arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
      arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards
      make[1]: *** [arch/powerpc/kernel/head_64.o] Error 1
      
      A number of attempts to fix the problem by moving around code have been
      unsuccessful and resulted in failed builds for some configurations and
      the discovery of toolchain bugs.
      
      Fix the problem by disabling RELOCATABLE for COMPILE_TEST builds instead.
      While this is less than perfect, it avoids substantial code changes
      which would otherwise be necessary just to make COMPILE_TEST builds
      happy and might have undesired side effects.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      fb43e847
    • J
      powerpc/perf: Clear MMCR2 when enabling PMU · b50a6c58
      Joel Stanley 提交于
      On POWER8 when switching to a KVM guest we set bits in MMCR2 to freeze
      the PMU counters. Aside from on boot they are then never reset,
      resulting in stuck perf counters for any user in the guest or host.
      
      We now set MMCR2 to 0 whenever enabling the PMU, which provides a sane
      state for perf to use the PMU counters under either the guest or the
      host.
      
      This was manifesting as a bug with ppc64_cpu --frequency:
      
          $ sudo ppc64_cpu --frequency
          WARNING: couldn't run on cpu 0
          WARNING: couldn't run on cpu 8
            ...
          WARNING: couldn't run on cpu 144
          WARNING: couldn't run on cpu 152
          min:    18446744073.710 GHz (cpu -1)
          max:    0.000 GHz (cpu -1)
          avg:    0.000 GHz
      
      The command uses a perf counter to measure CPU cycles over a fixed
      amount of time, in order to approximate the frequency of the machine.
      The counters were returning zero once a guest was started, regardless of
      weather it was still running or had been shut down.
      
      By dumping the value of MMCR2, it was observed that once a guest is
      running MMCR2 is set to 1s - which stops counters from running:
      
          $ sudo sh -c 'echo p > /proc/sysrq-trigger'
          CPU: 0 PMU registers, ppmu = POWER8 n_counters = 6
          PMC1:  5b635e38 PMC2: 00000000 PMC3: 00000000 PMC4: 00000000
          PMC5:  1bf5a646 PMC6: 5793d378 PMC7: deadbeef PMC8: deadbeef
          MMCR0: 0000000080000000 MMCR1: 000000001e000000 MMCRA: 0000040000000000
          MMCR2: fffffffffffffc00 EBBHR: 0000000000000000
          EBBRR: 0000000000000000 BESCR: 0000000000000000
          SIAR:  00000000000a51cc SDAR:  c00000000fc40000 SIER:  0000000001000000
      
      This is done unconditionally in book3s_hv_interrupts.S upon entering the
      guest, and the original value is only save/restored if the host has
      indicated it was using the PMU. This is okay, however the user of the
      PMU needs to ensure that it is in a defined state when it starts using
      it.
      
      Fixes: e05b9b9e ("powerpc/perf: Power8 PMU support")
      Cc: stable@vger.kernel.org
      Signed-off-by: NJoel Stanley <joel@jms.id.au>
      Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      b50a6c58
    • J
      powerpc/perf: Add PPMU_ARCH_207S define · 4d9690dd
      Joel Stanley 提交于
      Instead of separate bits for every POWER8 PMU feature, have a single one
      for v2.07 of the architecture.
      
      This saves us adding a MMCR2 define for a future patch.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NJoel Stanley <joel@jms.id.au>
      Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      4d9690dd
    • J
      powerpc/kvm: Remove redundant save of SIER AND MMCR2 · f73128f4
      Joel Stanley 提交于
      These two registers are already saved in the block above. Aside from
      being unnecessary, by the time we get down to the second save location
      r8 no longer contains MMCR2, so we are clobbering the saved value with
      PMC5.
      
      MMCR2 primarily consists of counter freeze bits. So restoring the value
      of PMC5 into MMCR2 will most likely have the effect of freezing
      counters.
      
      Fixes: 72cde5a8 ("KVM: PPC: Book3S HV: Save/restore host PMU registers that are new in POWER8")
      Cc: stable@vger.kernel.org
      Signed-off-by: NJoel Stanley <joel@jms.id.au>
      Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
      Acked-by: NPaul Mackerras <paulus@samba.org>
      Reviewed-by: NAlexander Graf <agraf@suse.de>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      f73128f4
    • P
      powerpc/powernv: Check for IRQHAPPENED before sleeping · c733cf83
      Preeti U Murthy 提交于
      Commit 8d6f7c5a: "powerpc/powernv: Make it possible to skip the IRQHAPPENED
      check in power7_nap()" added code that prevents cpus from checking for
      pending interrupts just before entering sleep state, which is wrong. These
      interrupts are delivered during the soft irq disabled state of the cpu.
      
      A cpu cannot enter any idle state with pending interrupts because they will
      never be serviced until the next time the cpu is woken up by some other
      interrupt. Its only then that the pending interrupts are replayed. This can result
      in device timeouts or warnings about this cpu being stuck.
      
      This patch fixes ths issue by ensuring that cpus check for pending interrupts
      just before entering any idle state as long as they are not in the path of split
      core operations.
      Signed-off-by: NPreeti U Murthy <preeti@linux.vnet.ibm.com>
      Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      c733cf83
    • M
      powerpc: Clean up MMU_FTRS_A2 and MMU_FTR_TYPE_3E · cd68098b
      Michael Ellerman 提交于
      In fb5a5157 "powerpc: Remove platforms/wsp and associated pieces",
      we removed the last user of MMU_FTRS_A2. So remove it.
      
      MMU_FTRS_A2 was the last user of MMU_FTR_TYPE_3E, so remove it also.
      This leaves some unreachable code in mmu_context_nohash.c, so remove
      that also.
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      cd68098b
    • M
      powerpc/cell: Fix compilation with CONFIG_COREDUMP=n · e623fbf1
      Michael Ellerman 提交于
      Commit 046d662f "coredump: make core dump functionality optional"
      made the coredump optional, but didn't update the spufs code that
      depends on it. That leads to build errors such as:
      
        arch/powerpc/platforms/built-in.o: In function `.spufs_arch_write_note':
        coredump.c:(.text+0x22cd4): undefined reference to `.dump_emit'
        coredump.c:(.text+0x22cf4): undefined reference to `.dump_emit'
        coredump.c:(.text+0x22d0c): undefined reference to `.dump_align'
        coredump.c:(.text+0x22d48): undefined reference to `.dump_emit'
        coredump.c:(.text+0x22e7c): undefined reference to `.dump_skip'
      
      Fix it by adding some ifdefs in the cell code.
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e623fbf1
    • L
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · fe5aa8a6
      Linus Torvalds 提交于
      Pull kbuild fixes from Michal Marek:
       "Three more fixes for the relative build dir feature:
      
         - Shut up make -s again
         - Fix for rpm/deb/tar-pkg with O=<subdir>
         - Fix for CONFIG_EXTRA_FIRMWARE"
      
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        firmware: Create directories for external firmware
        kbuild: Fix packaging targets with relative $(srctree)
        kbuild: Do not print the build directory with make -s
      fe5aa8a6
    • L
      Merge tag 'pm+acpi-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · b67db9d5
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are a few regression fixes for ACPI device enumeration and
        resources management, intel_pstate and cpufreq, a revert of an ACPI
        commit removing user space interfaces in /proc that we incorrectly
        thought were not used any more, fixes for some long-standing
        concurrency issues in the ACPI EC driver, two ACPI battery driver
        fixes, stable-candidate fixes for intel_pstate, an ACPI-related fix
        for i915 and two new ACPI video blacklist entries for Win8-oriented
        BIOSes.
      
        Specifics:
      
         - Missing device ID for ACPI enumeration of PNP devices that we
           overlooked during the recent rework of that code from Zhang Rui.
      
         - Fix for a problem introduced during the 3.14 cycle in the ACPI
           device resources management code and causing it to reject all
           resources of length 0 although some of them are actually valid
           which affects serial ports detection on a number of systems.  From
           Andy Whitcroft.
      
         - intel_pstate fix for a boot problem on some BayTrail-based systems
           introduced by a previous fix related to that platform during the
           3.13 cycle from Dirk Brandewie.
      
         - Revert of a 3.13 commit that removed the ACPI AC /proc interface
           which turns out to be still needed by some old utilities
           (kpowersave from kde 3.5.10 in particular) from Lan Tianyu.
      
         - cpufreq build fix for the davinci ARM platform from Prabhakar Lad
           (the breakage was introduced during the 3.10 cycle).
      
         - ACPI-related i915 fix preventing firmware on some Thinkpad laptops
           from setting backlight levels incorrectly during AC plug/unplug.
           From Aaron Lu.
      
         - Fixes for two nasty race conditions in the ACPI embedded controller
           driver that may be responsible for a number of past bug reports
           related to the EC from Lv Zhang and a fix for two memory leaks in
           error code paths in that driver from Colin Ian King.
      
         - Fixes for a couple of corner-case issues in the intel_pstate driver
           (all candidates for -stable) from Dirk Brandewie and Vincent Minet.
      
         - Fixes for two corner-case issues in the ACPI battery driver from
           Josef Gajdusek and Lan Tianyu.
      
         - Two new ACPI video blacklist entries for Acer TravelMate B113 and
           Dell Inspiron 5737 from Edward Lin and Martin Kepplinger"
      
      * tag 'pm+acpi-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PNP: add soc_button_array device ID to PNP IDs list
        cpufreq: Makefile: fix compilation for davinci platform
        ACPI / video: Add Acer TravelMate B113 to native backlight blacklist
        ACPI / video: Add Dell Inspiron 5737 to the blacklist
        ACPI / i915: ignore firmware requests for backlight change
        ACPI / battery: fix wrong value of capacity_now reported when fully charged
        ACPI / resources: only reject zero length resources based at address zero
        ACPI / battery: Retry to get battery information if failed during probing
        ACPI / EC: Free saved_ec on error exit path
        ACPI / EC: Add detailed fields debugging support of EC_SC(R).
        ACPI / EC: Update revision due to recent changes
        ACPI / EC: Fix race condition in ec_transaction_completed()
        ACPI / EC: Remove duplicated ec_wait_ibf0() waiter
        ACPI / EC: Add asynchronous command byte write support
        ACPI / EC: Avoid race condition related to advance_transaction()
        intel_pstate: Set CPU number before accessing MSRs
        intel_pstate: Update documentation of {max,min}_perf_pct sysfs files
        intel_pstate: don't touch turbo bit if turbo disabled or unavailable.
        intel_pstate: Fix setting VID
        Revert "ACPI / AC: Remove AC's proc directory."
      b67db9d5
    • D
      Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · bf38b025
      Dave Airlie 提交于
      This new request drops the pageflipping fixes for now.  Just a few small
      fixes for dpm, DP, and a fix for a hang on boot evergreen.
      
      * 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon/dpm: Reenabling SS on Cayman
        drm/radeon: fix typo in ci_stop_dpm()
        drm/radeon: fix typo in golden register setup on evergreen
        drm/radeon: only print meaningful VM faults
        drm/radeon/dp: return -EIO for flags not zero case
      bf38b025
    • J
      x86-32, vdso: Fix vDSO build error due to missing align_vdso_addr() · d093601b
      Jan Beulich 提交于
      Relying on static functions used just once to get inlined (and
      subsequently have dead code paths eliminated) is wrong: Compilers are
      free to decide whether they do this, regardless of optimization level.
      With this not happening for vdso_addr() (observed with gcc 4.1.x), an
      unresolved reference to align_vdso_addr() causes the build to fail.
      
      [ hpa: vdso_addr() is never actually used on x86-32, as calculate_addr
        in map_vdso() is always false.  It ought to be possible to clean
        this up further, but this fixes the immediate problem. ]
      Signed-off-by: NJan Beulich <jbeulich@suse.com>
      Link: http://lkml.kernel.org/r/53B5863B02000078000204D5@mail.emea.novell.comAcked-by: NAndy Lutomirski <luto@amacapital.net>
      Tested-by: NBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Tested-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      d093601b
    • J
      x86-64, vdso: Fix vDSO build breakage due to empty .rela.dyn · 9f88b906
      Jan Beulich 提交于
      Certain ld versions (observed with 2.20.0) put an empty .rela.dyn
      section into shared object files, breaking the assumption on the number
      of sections to be copied to the final output. Simply discard any empty
      SHT_REL and SHT_RELA sections to address this.
      Signed-off-by: NJan Beulich <jbeulich@suse.com>
      Link: http://lkml.kernel.org/r/53B5861E02000078000204D1@mail.emea.novell.comAcked-by: NAndy Lutomirski <luto@amacapital.net>
      Tested-by: NBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Tested-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      9f88b906
    • A
      drm/radeon/dpm: Reenabling SS on Cayman · 41959341
      Alexandre Demers 提交于
      It reverts commit c745fe61 now that
      Cayman is stable since VDDCI fix. Spread spectrum was not the culprit.
      
      This depends on b0880e87
      (drm/radeon/dpm: fix vddci setup typo on cayman).
      Signed-off-by: NAlexandre Demers <alexandre.f.demers@gmail.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      41959341
    • A
      drm/radeon: fix typo in ci_stop_dpm() · ed963771
      Alex Deucher 提交于
      Need to use the RREG32_SMC() accessor since the register
      is an smc indirect index.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      ed963771
    • A
      drm/radeon: fix typo in golden register setup on evergreen · 6abafb78
      Alex Deucher 提交于
      Fixes hangs on driver load on some cards.
      
      bug:
      https://bugs.freedesktop.org/show_bug.cgi?id=76998Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      6abafb78
    • C
    • A
      drm/radeon/dp: return -EIO for flags not zero case · f6be5e64
      Alex Deucher 提交于
      If there are error flags in the aux transaction return
      -EIO rather than -EBUSY.  -EIO restarts the whole transaction
      while -EBUSY jus retries.  Fixes problematic aux transfers.
      
      Bug:
      https://bugs.freedesktop.org/show_bug.cgi?id=80684Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      f6be5e64
    • J
      dm mpath: fix IO hang due to logic bug in multipath_busy · 7a7a3b45
      Jun'ichi Nomura 提交于
      Commit e8099177 ("dm mpath: push back requests instead of queueing")
      modified multipath_busy() to return true if !pg_ready().  pg_ready()
      checks the current state of the multipath device and may return false
      even if a new IO is needed to change the state.
      
      Bart Van Assche reported that he had multipath IO lockup when he was
      performing cable pull tests.  Analysis showed that the multipath
      device had a single path group with both paths active, but that the
      path group itself was not active.  During the multipath device state
      transitions 'queue_io' got set but nothing could clear it.  Clearing
      'queue_io' only happens in __choose_pgpath(), but it won't be called
      if multipath_busy() returns true due to pg_ready() returning false
      when 'queue_io' is set.
      
      As such the !pg_ready() check in multipath_busy() is wrong because new
      IO will not be sent to multipath target and the multipath state change
      won't happen.  That results in multipath IO lockup.
      
      The intent of multipath_busy() is to avoid unnecessary cycles of
      dequeue + request_fn + requeue if it is known that the multipath
      device will requeue.
      
      Such "busy" situations would be:
        - path group is being activated
        - there is no path and the multipath is setup to requeue if no path
      
      Fix multipath_busy() to return "busy" early only for these specific
      situations.
      Reported-by: NBart Van Assche <bvanassche@acm.org>
      Tested-by: NBart Van Assche <bvanassche@acm.org>
      Signed-off-by: NJun'ichi Nomura <j-nomura@ce.jp.nec.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Cc: stable@vger.kernel.org # v3.15
      7a7a3b45
    • J
      dm io: fix a race condition in the wake up code for sync_io · 10f1d5d1
      Joe Thornber 提交于
      There's a race condition between the atomic_dec_and_test(&io->count)
      in dec_count() and the waking of the sync_io() thread.  If the thread
      is spuriously woken immediately after the decrement it may exit,
      making the on stack io struct invalid, yet the dec_count could still
      be using it.
      
      Fix this race by using a completion in sync_io() and dec_count().
      Reported-by: NMinfei Huang <huangminfei@ucloud.cn>
      Signed-off-by: NJoe Thornber <thornber@redhat.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Acked-by: NMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org
      10f1d5d1
    • J
      bf14299f
    • M
      dm: allocate a special workqueue for deferred device removal · acfe0ad7
      Mikulas Patocka 提交于
      The commit 2c140a24 ("dm: allow remove to be deferred") introduced a
      deferred removal feature for the device mapper.  When this feature is
      used (by passing a flag DM_DEFERRED_REMOVE to DM_DEV_REMOVE_CMD ioctl)
      and the user tries to remove a device that is currently in use, the
      device will be removed automatically in the future when the last user
      closes it.
      
      Device mapper used the system workqueue to perform deferred removals.
      However, some targets (dm-raid1, dm-mpath, dm-stripe) flush work items
      scheduled for the system workqueue from their destructor.  If the
      destructor itself is called from the system workqueue during deferred
      removal, it introduces a possible deadlock - the workqueue tries to flush
      itself.
      
      Fix this possible deadlock by introducing a new workqueue for deferred
      removals.  We allocate just one workqueue for all dm targets.  The
      ability of dm targets to process IOs isn't dependent on deferred removal
      of unused targets, so a deadlock due to shared workqueue isn't possible.
      
      Also, cleanup local_init() to eliminate potential for returning success
      on failure.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Cc: stable@vger.kernel.org # 3.13+
      acfe0ad7
    • R
      Merge branch 'pm-cpufreq' · 20910442
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: Makefile: fix compilation for davinci platform
        intel_pstate: Set CPU number before accessing MSRs
        intel_pstate: Update documentation of {max,min}_perf_pct sysfs files
        intel_pstate: don't touch turbo bit if turbo disabled or unavailable.
        intel_pstate: Fix setting VID
      20910442
    • R
      Merge branch 'acpi-video' · ff253d3d
      Rafael J. Wysocki 提交于
      * acpi-video:
        ACPI / video: Add Acer TravelMate B113 to native backlight blacklist
        ACPI / video: Add Dell Inspiron 5737 to the blacklist
        ACPI / i915: ignore firmware requests for backlight change
      ff253d3d
    • R
      Merge branch 'acpi-ec' · 0b80a8ff
      Rafael J. Wysocki 提交于
      * acpi-ec:
        ACPI / EC: Free saved_ec on error exit path
        ACPI / EC: Add detailed fields debugging support of EC_SC(R).
        ACPI / EC: Update revision due to recent changes
        ACPI / EC: Fix race condition in ec_transaction_completed()
        ACPI / EC: Remove duplicated ec_wait_ibf0() waiter
        ACPI / EC: Add asynchronous command byte write support
        ACPI / EC: Avoid race condition related to advance_transaction()
      0b80a8ff
    • R
      Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery' · 4488c99b
      Rafael J. Wysocki 提交于
      * acpi-resources:
        ACPI / resources: only reject zero length resources based at address zero
      
      * acpi-ac:
        Revert "ACPI / AC: Remove AC's proc directory."
      
      * acpi-scan:
        ACPI / PNP: add soc_button_array device ID to PNP IDs list
      
      * acpi-battery:
        ACPI / battery: fix wrong value of capacity_now reported when fully charged
        ACPI / battery: Retry to get battery information if failed during probing
      4488c99b
    • L
      Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 4c718423
      Linus Torvalds 提交于
      Pull libata fixes from Tejun Heo:
       "Nothing too interesting.  All fixes are ahci_platform related"
      
      * 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command.
        libahci: export ahci_qc_issue() and ahci_start_fix_rx()
        ata: ahci_imx: warn when disabling ahci link
        ahci: disable ncq feature for hisilicon sata
        ahci: imx: manage only sata_ref_clk in imx_sata_enable[disable]
        libahci_platform: Fail when PHY required but PHY support disabled
      4c718423
    • L
      Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 40f61237
      Linus Torvalds 提交于
      Pull cgroup fixes from Tejun Heo:
       "Mostly fixes for the fallouts from the recent cgroup core changes.
      
        The decoupled nature of cgroup dynamic hierarchy management
        (hierarchies are created dynamically on mount but may or may not be
        reused once unmounted depending on remaining usages) led to more
        ugliness being added to kernfs.
      
        Hopefully, this is the last of it"
      
      * 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cpuset: break kernfs active protection in cpuset_write_resmask()
        cgroup: fix a race between cgroup_mount() and cgroup_kill_sb()
        kernfs: introduce kernfs_pin_sb()
        cgroup: fix mount failure in a corner case
        cpuset,mempolicy: fix sleeping function called from invalid context
        cgroup: fix broken css_has_online_children()
      40f61237
    • L
      Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · a805cbf4
      Linus Torvalds 提交于
      Pull workqueue fixes from Tejun Heo:
       "Two workqueue fixes.  Both are one liners.  One fixes missing uevent
        for workqueue files on sysfs.  The other one fixes missing zeroing of
        NUMA cpu masks which can lead to oopses among other things"
      
      * 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: zero cpumask of wq_numa_possible_cpumask on init
        workqueue: fix dev_set_uevent_suppress() imbalance
      a805cbf4
    • L
      Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · b3e87bdd
      Linus Torvalds 提交于
      Pull percpu fix from Tejun Heo:
       "One patch to fix a typo in percpu section name.  Given how long the
        bug has been there and that there hasn't been any report of brekage,
        it's unlikely to cause actual issues"
      
      * 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        core: fix typo in percpu read_mostly section
      b3e87bdd
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 8de74717
      Linus Torvalds 提交于
      Pull i2c build fix and cleanup from Wolfram Sang:
       "One buildfix for the i2c subsystem.  While here, I decided to add the
        header cleanup as well"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: sun6i-p2wi: Remove duplicate inclusion of module.h
        i2c: mux: pca954x: fix dependencies
      8de74717
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 9ab6e6e7
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This push fixes an error in sha512_ssse3 that leads to incorrect
        output as well as a memory leak in caam_jr when the module is
        unloaded"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: caam - fix memleak in caam_jr module
        crypto: sha512_ssse3 - fix byte count to bit count conversion
      9ab6e6e7
  3. 10 7月, 2014 2 次提交
    • C
      crypto: caam - fix memleak in caam_jr module · 0378c9a8
      Cristian Stoica 提交于
      This patch fixes a memory leak that appears when caam_jr module is unloaded.
      
      Cc: <stable@vger.kernel.org> # 3.13+
      Signed-off-by: NCristian Stoica <cristian.stoica@freescale.com>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      0378c9a8
    • D
      Merge tag 'drm-intel-fixes-2014-07-09' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 2db38e06
      Dave Airlie 提交于
      Fixes for regressions and black screens, cc: stable where applicapable
      (the last minute rebase was to sprinkle missing stable tags). A bit more
      than what I'd wish for, but excluding vlv and that the first 3 patches are
      just quirks for 1 regression it looks much better.
      
      There's still a "oops, lost dithering" issue on older platforms open. I'm
      working on a fix for that now but didn't want to delay this pile.
      
      * tag 'drm-intel-fixes-2014-07-09' of git://anongit.freedesktop.org/drm-intel:
        drm/i915/vlv: T12 eDP panel timing enforcement during reboot
        drm/i915: Only unbind vgacon, not other console drivers
        drm/i915: Don't clobber the GTT when it's within stolen memory
        drm/i915/vlv: Update the DSI ULPS entry/exit sequence
        drm/i915/vlv: DPI FIFO empty check is not needed
        drm/i915: Toshiba CB35 has a controllable backlight
        drm/i915: Acer C720 and C720P have controllable backlights
        drm/i915: quirk asserts controllable backlight presence, overriding VBT
      2db38e06