1. 07 5月, 2014 8 次提交
    • T
      ARM: dts: Enable N900 keyboard sleep leds by default · c1be2032
      Tony Lindgren 提交于
      On N900 there are nice LEDs that show the state of the
      sys_clkreq and sys_off_mode pins.
      
      These LEDs go low when the system enters deeper idle
      states. The left LED shows the state of the sys_clkreq
      pin, and goes off during retention idle. The right LED
      shows the state of sys_off_mode pin and both go off
      during off idle.
      
      As N900 is a battery operated device, these LEDs should
      be off most of the time. So let's enable them by default
      so we can make sure the system is mostly idle.
      
      This allows the maintainers to also immediately test
      patches for PM regressions by looking at the LEDs,
      which certainly makes my life easier.
      
      The LED can naturally be disabled during runtime with:
      
      # echo none > /sys/class/leds/debug::sleep/trigger
      
      Note that we don't currently have support for omap3
      errata 1.158 that remuxes GPIO pins to INPUT_PULLUP |
      MUX_MODE7 for the duration of idle. This means that the
      GPIO pins set high will go down during off idle. In this
      case it does not matter as the sys_off_mode goes down
      too, but there's still a slim chance of false off idle
      LED signals. If in doubt, false LED signals can be
      verified by the sys_off_mode or vdd_core values.
      
      Also note that to allow the UARTs to autoidle, the
      following needs to be run on N900 to enable off idle:
      
      #!/bin/sh
      uarts=$(find /sys/class/tty/ttyO*/device/power/ -type d)
      for uart in $uarts; do
      	echo 3000 > $uart/autosuspend_delay_ms
      done
      
      uarts=$(find /sys/class/tty/ttyO*/power/ -type d)
      for uart in $uarts; do
      	echo enabled > $uart/wakeup
      	echo auto > $uart/control
      done
      
      echo 1 > /sys/kernel/debug/pm_debug/enable_off_mode
      
      For retention idle, change the above to set 0 to
      enable_off_mode.
      
      Also note that without the twl4030 PM scripts the actual
      voltage scaling won't happen for off idle so we only get
      voltage scaling over I2C4 for retention idle. I'll do
      some device tree patches for those also a bit later on.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Pali Rohár <pali.rohar@gmail.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Pavel Machek <pavel@ucw.cz>
      Cc: Sebastian Reichel <sre@kernel.org>
      Cc: Tero Kristo <t-kristo@ti.com>
      Acked-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      [tony@atomide.com: also make sure the LEDs get built to see PM regressions]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      c1be2032
    • T
      ARM: OMAP2+: Fix voltage scaling init for device tree · 2ee5f528
      Tony Lindgren 提交于
      We are currently disabling the init of voltage scaling
      for device tree. With the voltage scaling problems fixed
      for omap3 in general, there's no need to disable the voltage
      scaling init for device tree based booting.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      2ee5f528
    • T
      ARM: dts: Configure omap3 twl4030 I2C4 pins by default · 327456a7
      Tony Lindgren 提交于
      Almost certainly any sane board has the twl4030 has the I2C4
      pins connected as those are needed for voltage control during
      idle. If the I2C4 lines are not properly muxed, any voltage
      scaling over I2C4 will fail.
      
      Let's mux those pins by default, the boards that are not using
      them can still configure things separately.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      327456a7
    • T
      ARM: OMAP3: Fix voltage control for deeper idle states · c46f601c
      Tony Lindgren 提交于
      Currently we're attempting to use a static value for the
      voltctrl register that only works for controlling the PMIC
      over I2C4. For using sys_off_mode signaling, we need to update
      update clksetup, voltsetup1, voltsetup2 and voltctrl registers
      dynamically depending on the idle state.
      
      So let's fix this by configuring things for I2C4 controlled idle
      and sys_off_mode pin controlled idle, and then write the
      configured register values depending on the idle state. This
      is similar what N900 kernel is doing too.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      c46f601c
    • T
      ARM: OMAP3: Disable broken omap3_set_off_timings function · 9eca2837
      Tony Lindgren 提交于
      Commit c589eb38 (ARM: OMAP3: VC: calculate ramp times)
      started using regulator slew rates for calculating the idle
      mode start-up times. This works fine for I2C4 controlled
      regulator scaling as the regulators are never completely
      turned off.
      
      For sys_off_mode pin controlled PMIC scripts, the slew rate
      based calculations won't work at all as the regulators are
      completely turned off and the start-up time is much longer.
      
      This means currently omap3_set_off_timings currently has
      zero chance of working on any real hardare. The current code
      is broken in at least the following ways:
      
      1. It attempts to use the default ULONG_MAX value for the
         oscillator start-up value as we're currently never
         initializing the start-up value.
      
      2. It relies on a magic number potentially set by the
         bootloader for volsetup2 register.
      
      3. If no magic value is passed, it attempts to calculate
         voltsetup2 register based on the regulator slew rate.
         This won't work as there is roughly at least five
         times the delay needed for turning on vdd1 and vdd2
         regulators.
      
      4. It does duplicate register write to OMAP3_PRM_VOLTOFFSET
      
      5. It duplicates the code for omap_usec_to_32k unnecessarily
      
      6. It initialized global registers twice, once for each channel
      
      Let's just remove the broken code and call omap3_set_i2c_timings
      directly, we're better off with this function doing nothing until
      it's fixed. And otherwise further fixes to omap3_set_off_timings
      will be unreadable.
      
      And let's get rid of omap3_set_clksetup as that's not needed
      for off-idle controlled by I2C4 as in that case the oscillator
      is never shut down.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      9eca2837
    • T
      ARM: OMAP3: Fix idle mode signaling for sys_clkreq and sys_off_mode · 3b8c4ebb
      Tony Lindgren 提交于
      While debugging legacy mode vs device tree booted PM regressions,
      I noticed that omap3 is not toggling sys_clkreq and sys_off_mode
      pins like it should.
      
      The sys_clkreq and sys_off_mode pins are not toggling because of
      the following issues:
      
      1. The default polarity for the sys_off_mode pin is wrong.
         OFFMODE_POL needs to be cleared for sys_off_mode to go down when
         hitting off-idle, while CLKREQ_POL needs to be set so sys_clkreq
         goes down when hitting retention.
      
      2. The values for voltctrl register need to be updated dynamically.
         We need to set either the retention idle bits, or off idle bits
         in the voltctrl register depending the idle mode we're targeting
         to hit.
      
      Let's fix these two issues as otherwise the system will just
      hang if any twl4030 PMIC idle scripts are loaded. The only case
      where the system does not hang is if only retention idle over I2C4
      is configured by the bootloader.
      
      Note that even without the twl4030 PMIC scripts, these fixes will
      do the proper signaling of sys_clkreq and sys_off_mode pins, so
      the fixes are needed to fix monitoring of PM states with LEDs or
      an oscilloscope.
      
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      3b8c4ebb
    • T
      ARM: dts: Fix omap serial wake-up when booted with device tree · 31f0820a
      Tony Lindgren 提交于
      We've had deeper idle states working on omaps for few years now,
      but only in the legacy mode. When booted with device tree, the
      wake-up events did not have a chance to work until commit
      3e6cee17 (pinctrl: single: Add support for wake-up interrupts)
      that recently got merged. In addition to that we also needed commit
      79d97015 (of/irq: create interrupts-extended property) and
      9ec36caf (of/irq: do irq resolution in platform_get_irq) that
      are now also merged.
      
      So let's fix the wake-up events for some selected omaps so devices
      booted in device tree mode won't just hang if deeper power states
      are enabled, and so systems can wake up from suspend to the serial
      port event.
      
      Note that there's no longer need to specify the wake-up bit in
      the pinctrl settings, the request_irq on the wake-up pin takes
      care of that.
      
      Cc: devicetree@vger.kernel.org
      Cc: "Benoît Cousson" <bcousson@baylibre.com>
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      [tony@atomide.com: updated comments, added board LDP]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      31f0820a
    • T
      Merge tag 'ib-mfd-omap-3.16' of... · 08eb9a8c
      Tony Lindgren 提交于
      Merge tag 'ib-mfd-omap-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into omap-for-v3.16/pm
      
      Immutable branch between MFD and ARM OMAP due for v3.16 merge-window.
      08eb9a8c
  2. 05 5月, 2014 4 次提交
    • L
      Linux 3.15-rc4 · 89ca3b88
      Linus Torvalds 提交于
      89ca3b88
    • L
      Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux · 164c0997
      Linus Torvalds 提交于
      Pull file locking change from Jeff Layton:
       "Only an email address change to the MAINTAINERS file"
      
      * tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux:
        MAINTAINERS: email address change for Jeff Layton
      164c0997
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8a9f5ecd
      Linus Torvalds 提交于
      Pull arm64 fixes from Catalin Marinas:
       "These are mostly arm64 fixes with an additional arm(64) platform fix
        for the initialisation of vexpress clocks (the latter only affecting
        arm64; the arch/arm64 code is SoC agnostic and does not rely on early
        SoC-specific calls)
      
         - vexpress platform clocks initialisation moved earlier following the
           arm64 move of of_clk_init() call in a previous commit
         - Default DMA ops changed to non-coherent to preserve compatibility
           with 32-bit ARM DT files.  The "dma-coherent" property can be used
           to explicitly mark a device coherent.  The Applied Micro DT file
           has been updated to avoid DMA cache maintenance for the X-Gene SATA
           controller (the only arm64 related driver with such assumption in
           -rc mainline)
         - Fixmap correction for earlyprintk
         - kern_addr_valid() fix for huge pages"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        vexpress: Initialise the sysregs before setting up the clocks
        arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent
        arm64: Use bus notifiers to set per-device coherent DMA ops
        arm64: Make default dma_ops to be noncoherent
        arm64: fixmap: fix missing sub-page offset for earlyprintk
        arm64: Fix for the arm64 kern_addr_valid() function
      8a9f5ecd
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · e3fb7d4c
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is two patches both fixing bugs in drivers (virtio-scsi and
        mpt2sas) causing an oops in certain circumstances"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
        [SCSI] mpt2sas: Don't disable device twice at suspend.
      e3fb7d4c
  3. 04 5月, 2014 6 次提交
  4. 03 5月, 2014 13 次提交
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0384dcae
      Linus Torvalds 提交于
      Pull irq fixes from Thomas Gleixner:
       "This udpate delivers:
      
         - A fix for dynamic interrupt allocation on x86 which is required to
           exclude the GSI interrupts from the dynamic allocatable range.
      
           This was detected with the newfangled tablet SoCs which have GPIOs
           and therefor allocate a range of interrupts.  The MSI allocations
           already excluded the GSI range, so we never noticed before.
      
         - The last missing set_irq_affinity() repair, which was delayed due
           to testing issues
      
         - A few bug fixes for the armada SoC interrupt controller
      
         - A memory allocation fix for the TI crossbar interrupt controller
      
         - A trivial kernel-doc warning fix"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: irq-crossbar: Not allocating enough memory
        irqchip: armanda: Sanitize set_irq_affinity()
        genirq: x86: Ensure that dynamic irq allocation does not conflict
        linux/interrupt.h: fix new kernel-doc warnings
        irqchip: armada-370-xp: Fix releasing of MSIs
        irqchip: armada-370-xp: implement the ->check_device() msi_chip operation
        irqchip: armada-370-xp: fix invalid cast of signed value into unsigned variable
      0384dcae
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98facf0e
      Linus Torvalds 提交于
      Pull timer fixes from Thomas Gleixner:
       "This update brings along:
      
         - Two fixes for long standing bugs in the hrtimer code, one which
           prevents remote enqueuing and the other preventing arbitrary delays
           after a interrupt hang was detected
      
         - A fix in the timer wheel which prevents math overflow
      
         - A fix for a long standing issue with the architected ARM timer
           related to the C3STOP mechanism.
      
         - A trivial compile fix for nspire SoC clocksource"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timer: Prevent overflow in apply_slack
        hrtimer: Prevent remote enqueue of leftmost timers
        hrtimer: Prevent all reprogramming if hang detected
        clocksource: nspire: Fix compiler warning
        clocksource: arch_arm_timer: Fix age-old arch timer C3STOP detection issue
      98facf0e
    • L
      Merge tag 'trace-fixes-v3.15-rc3' of... · 00622e61
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fix from Steven Rostedt:
       "This is a small fix where the trigger code used the wrong
        rcu_dereference().  It required rcu_dereference_sched() instead of the
        normal rcu_dereference().  It produces a nasty RCU lockdep splat due
        to the incorrect rcu notation"
      Acked-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      
      * tag 'trace-fixes-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Use rcu_dereference_sched() for trace event triggers
      00622e61
    • S
      tracing: Use rcu_dereference_sched() for trace event triggers · 561a4fe8
      Steven Rostedt (Red Hat) 提交于
      As trace event triggers are now part of the mainline kernel, I added
      my trace event trigger tests to my test suite I run on all my kernels.
      Now these tests get run under different config options, and one of
      those options is CONFIG_PROVE_RCU, which checks under lockdep that
      the rcu locking primitives are being used correctly. This triggered
      the following splat:
      
      ===============================
      [ INFO: suspicious RCU usage. ]
      3.15.0-rc2-test+ #11 Not tainted
      -------------------------------
      kernel/trace/trace_events_trigger.c:80 suspicious rcu_dereference_check() usage!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 1, debug_locks = 0
      4 locks held by swapper/1/0:
       #0:  ((&(&j_cdbs->work)->timer)){..-...}, at: [<ffffffff8104d2cc>] call_timer_fn+0x5/0x1be
       #1:  (&(&pool->lock)->rlock){-.-...}, at: [<ffffffff81059856>] __queue_work+0x140/0x283
       #2:  (&p->pi_lock){-.-.-.}, at: [<ffffffff8106e961>] try_to_wake_up+0x2e/0x1e8
       #3:  (&rq->lock){-.-.-.}, at: [<ffffffff8106ead3>] try_to_wake_up+0x1a0/0x1e8
      
      stack backtrace:
      CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.15.0-rc2-test+ #11
      Hardware name:                  /DG965MQ, BIOS MQ96510J.86A.0372.2006.0605.1717 06/05/2006
       0000000000000001 ffff88007e083b98 ffffffff819f53a5 0000000000000006
       ffff88007b0942c0 ffff88007e083bc8 ffffffff81081307 ffff88007ad96d20
       0000000000000000 ffff88007af2d840 ffff88007b2e701c ffff88007e083c18
      Call Trace:
       <IRQ>  [<ffffffff819f53a5>] dump_stack+0x4f/0x7c
       [<ffffffff81081307>] lockdep_rcu_suspicious+0x107/0x110
       [<ffffffff810ee51c>] event_triggers_call+0x99/0x108
       [<ffffffff810e8174>] ftrace_event_buffer_commit+0x42/0xa4
       [<ffffffff8106aadc>] ftrace_raw_event_sched_wakeup_template+0x71/0x7c
       [<ffffffff8106bcbf>] ttwu_do_wakeup+0x7f/0xff
       [<ffffffff8106bd9b>] ttwu_do_activate.constprop.126+0x5c/0x61
       [<ffffffff8106eadf>] try_to_wake_up+0x1ac/0x1e8
       [<ffffffff8106eb77>] wake_up_process+0x36/0x3b
       [<ffffffff810575cc>] wake_up_worker+0x24/0x26
       [<ffffffff810578bc>] insert_work+0x5c/0x65
       [<ffffffff81059982>] __queue_work+0x26c/0x283
       [<ffffffff81059999>] ? __queue_work+0x283/0x283
       [<ffffffff810599b7>] delayed_work_timer_fn+0x1e/0x20
       [<ffffffff8104d3a6>] call_timer_fn+0xdf/0x1be^M
       [<ffffffff8104d2cc>] ? call_timer_fn+0x5/0x1be
       [<ffffffff81059999>] ? __queue_work+0x283/0x283
       [<ffffffff8104d823>] run_timer_softirq+0x1a4/0x22f^M
       [<ffffffff8104696d>] __do_softirq+0x17b/0x31b^M
       [<ffffffff81046d03>] irq_exit+0x42/0x97
       [<ffffffff81a08db6>] smp_apic_timer_interrupt+0x37/0x44
       [<ffffffff81a07a2f>] apic_timer_interrupt+0x6f/0x80
       <EOI>  [<ffffffff8100a5d8>] ? default_idle+0x21/0x32
       [<ffffffff8100a5d6>] ? default_idle+0x1f/0x32
       [<ffffffff8100ac10>] arch_cpu_idle+0xf/0x11
       [<ffffffff8107b3a4>] cpu_startup_entry+0x1a3/0x213
       [<ffffffff8102a23c>] start_secondary+0x212/0x219
      
      The cause is that the triggers are protected by rcu_read_lock_sched() but
      the data is dereferenced with rcu_dereference() which expects it to
      be protected with rcu_read_lock(). The proper reference should be
      rcu_dereference_sched().
      
      Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
      Cc: stable@vger.kernel.org # 3.14+
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      561a4fe8
    • L
      Merge tag 'pm+acpi-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 6c6ca9c2
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "A bunch of regression fixes this time.  They fix two regressions in
        the PNP subsystem, one in the ACPI processor driver and one in the
        ACPI EC driver, four cpufreq driver regressions and an unrelated bug
        in one of the drivers.  The regressions are recent or introduced in
        3.14.
      
        Specifics:
      
         - There are two bugs in the ACPI PNP core that cause errors to be
           returned if optional ACPI methods are not present.  After an ACPI
           core change made in 3.14 one of those errors leads to serial port
           suspend failures on some systems.  Fix from Rafael J Wysocki.
      
         - A recently added PNP quirk related to Intel chipsets intorduced a
           build error in unusual configurations (PNP without PCI).  Fix from
           Bjorn Helgaas.
      
         - An ACPI EC workaround related to system suspend on Samsung machines
           added in 3.14 introduced a race causing some valid EC events to be
           discarded.  Fix from Kieran Clancy.
      
         - The acpi-cpufreq driver fails to load on some systems after a 3.14
           commit related to APIC ID parsing that overlooked one corner case.
           Fix from Lan Tianyu.
      
         - Fix for a recently introduced build problem in the ppc-corenet
           cpufreq driver from Tim Gardner.
      
         - A recent cpufreq core change to ensure serialization of frequency
           transitions for drivers with a ->target_index() callback overlooked
           the fact that some of those drivers had been doing operations
           introduced by it into the core already by themselves.  That
           resulted in a mess in which the core and the drivers try to do the
           same thing and block each other which leads to deadlocks.  Fixes
           for the powernow-k7, powernow-k6, and longhaul cpufreq drivers from
           Srivatsa S Bhat.
      
         - Fix for a computational error in the powernow-k6 cpufreq driver
           from Srivatsa S Bhat"
      
      * tag 'pm+acpi-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / processor: Fix failure of loading acpi-cpufreq driver
        PNP / ACPI: Do not return errors if _DIS or _SRS are not present
        PNP: Fix compile error in quirks.c
        ACPI / EC: Process rather than discard events in acpi_ec_clear
        cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error
        cpufreq: powernow-k7: Fix double invocation of cpufreq_freq_transition_begin/end
        cpufreq: powernow-k6: Fix double invocation of cpufreq_freq_transition_begin/end
        cpufreq: powernow-k6: Fix incorrect comparison with max_multipler
        cpufreq: longhaul: Fix double invocation of cpufreq_freq_transition_begin/end
      6c6ca9c2
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · e981e795
      Linus Torvalds 提交于
      Pull driver core deferred probe fix from Grant Likely:
       "Drivercore race condition fix (exposed by devicetree)
      
        This branch fixes a bug where a device can get stuck in the deferred
        list even though all its dependencies are met.  The bug has existed
        for a long time, but new platform conversions to device tree have
        exposed it.  This patch is needed to get those platforms working.
      
        This was the pending bug fix I mentioned in my previous pull request.
        Normally this would go through Greg's tree seeing that it is a
        drivercore change, but devicetree exposes the problem.  I've discussed
        with Greg and he okayed me asking you to pull directly"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        drivercore: deferral race condition fix
      e981e795
    • R
      Merge branches 'acpi-ec' and 'acpi-processor' · de3afce5
      Rafael J. Wysocki 提交于
      * acpi-ec:
        ACPI / EC: Process rather than discard events in acpi_ec_clear
      
      * acpi-processor:
        ACPI / processor: Fix failure of loading acpi-cpufreq driver
      de3afce5
    • R
      Merge branch 'pnp' · 25d6db96
      Rafael J. Wysocki 提交于
      * pnp:
        PNP / ACPI: Do not return errors if _DIS or _SRS are not present
        PNP: Fix compile error in quirks.c
      25d6db96
    • R
      Merge branch 'pm-cpufreq' · d705116f
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error
        cpufreq: powernow-k7: Fix double invocation of cpufreq_freq_transition_begin/end
        cpufreq: powernow-k6: Fix double invocation of cpufreq_freq_transition_begin/end
        cpufreq: powernow-k6: Fix incorrect comparison with max_multipler
        cpufreq: longhaul: Fix double invocation of cpufreq_freq_transition_begin/end
      d705116f
    • L
      Merge tag 'dm-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 54366a7f
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
       "A few dm-thinp fixes for changes merged in 3.15-rc1.
      
        A dm-verity fix for an immutable biovec regression that affects 3.14+.
      
        A dm-cache fix to properly quiesce when using writethrough mode (3.14+)"
      
      * tag 'dm-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache: fix writethrough mode quiescing in cache_map
        dm thin: use INIT_WORK_ONSTACK in noflush_work to avoid ODEBUG warning
        dm verity: fix biovecs hash calculation regression
        dm thin: fix rcu_read_lock being held in code that can sleep
        dm thin: irqsave must always be used with the pool->lock spinlock
      54366a7f
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0845e11c
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "Two very small changes: one fix for the vSMP Foundation platform, and
        one to help LLVM not choke on options it doesn't understand (although
        it probably should)"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vsmp: Fix irq routing
        x86: LLVMLinux: Wrap -mno-80387 with cc-option
      0845e11c
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · e7e6d2a4
      Linus Torvalds 提交于
      Pull KVM fixes from Paolo Bonzini:
       - Fix for a Haswell regression in nested virtualization, introduced
         during the merge window.
       - A fix from Oleg to async page faults.
       - A bunch of small ARM changes.
       - A trivial patch to use the new MSI-X API introduced during the merge
         window.
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
        KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
        KVM: async_pf: mm->mm_users can not pin apf->mm
        KVM: ARM: vgic: Fix sgi dispatch problem
        MAINTAINERS: co-maintainance of KVM/{arm,arm64}
        arm: KVM: fix possible misalignment of PGDs and bounce page
        KVM: x86: Check for host supported fields in shadow vmcs
        kvm: Use pci_enable_msix_exact() instead of pci_enable_msix()
        ARM: KVM: disable KVM in Kconfig on big-endian systems
      e7e6d2a4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · b28e4f08
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "Two bug fixes, one to fix a potential information leak in the BPF jit
        and common-io-layer fix for old firmware levels"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/bpf,jit: initialize A register if 1st insn is BPF_S_LDX_B_MSH
        s390/chsc: fix SEI usage on old FW levels
      b28e4f08
  5. 02 5月, 2014 9 次提交