1. 03 5月, 2014 5 次提交
    • 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
    • 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
  2. 02 5月, 2014 9 次提交
  3. 01 5月, 2014 7 次提交
  4. 30 4月, 2014 16 次提交
  5. 29 4月, 2014 3 次提交
    • M
      dm thin: use INIT_WORK_ONSTACK in noflush_work to avoid ODEBUG warning · fbcde3d8
      Mike Snitzer 提交于
      Use INIT_WORK_ONSTACK to silence "ODEBUG: object is on stack, but not
      annotated".
      Reported-by: NZdeněk Kabeláč <zkabelac@redhat.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Acked-by: NJoe Thornber <ejt@redhat.com>
      fbcde3d8
    • G
      drivercore: deferral race condition fix · 58b116bc
      Grant Likely 提交于
      When the kernel is built with CONFIG_PREEMPT it is possible to reach a state
      when all modules loaded but some driver still stuck in the deferred list
      and there is a need for external event to kick the deferred queue to probe
      these drivers.
      
      The issue has been observed on embedded systems with CONFIG_PREEMPT enabled,
      audio support built as modules and using nfsroot for root filesystem.
      
      The following log fragment shows such sequence when all audio modules
      were loaded but the sound card is not present since the machine driver has
      failed to probe due to missing dependency during it's probe.
      The board is am335x-evmsk (McASP<->tlv320aic3106 codec) with davinci-evm
      machine driver:
      
      ...
      [   12.615118] davinci-mcasp 4803c000.mcasp: davinci_mcasp_probe: ENTER
      [   12.719969] davinci_evm sound.3: davinci_evm_probe: ENTER
      [   12.725753] davinci_evm sound.3: davinci_evm_probe: snd_soc_register_card
      [   12.753846] davinci-mcasp 4803c000.mcasp: davinci_mcasp_probe: snd_soc_register_component
      [   12.922051] davinci-mcasp 4803c000.mcasp: davinci_mcasp_probe: snd_soc_register_component DONE
      [   12.950839] davinci_evm sound.3: ASoC: platform (null) not registered
      [   12.957898] davinci_evm sound.3: davinci_evm_probe: snd_soc_register_card DONE (-517)
      [   13.099026] davinci-mcasp 4803c000.mcasp: Kicking the deferred list
      [   13.177838] davinci-mcasp 4803c000.mcasp: really_probe: probe_count = 2
      [   13.194130] davinci_evm sound.3: snd_soc_register_card failed (-517)
      [   13.346755] davinci_mcasp_driver_init: LEAVE
      [   13.377446] platform sound.3: Driver davinci_evm requests probe deferral
      [   13.592527] platform sound.3: really_probe: probe_count = 0
      
      In the log the machine driver enters it's probe at 12.719969 (this point it
      has been removed from the deferred lists). McASP driver already executing
      it's probing (since 12.615118).
      The machine driver tries to construct the sound card (12.950839) but did
      not found one of the components so it fails. After this McASP driver
      registers all the ASoC components (the machine driver still in it's probe
      function after it failed to construct the card) and the deferred work is
      prepared at 13.099026 (note that this time the machine driver is not in the
      lists so it is not going to be handled when the work is executing).
      Lastly the machine driver exit from it's probe and the core places it to
      the deferred list but there will be no other driver going to load and the
      deferred queue is not going to be kicked again - till we have external event
      like connecting USB stick, etc.
      
      The proposed solution is to try the deferred queue once more when the last
      driver is asking for deferring and we had drivers loaded while this last
      driver was probing.
      
      This way we can avoid drivers stuck in the deferred queue.
      Signed-off-by: NGrant Likely <grant.likely@linaro.org>
      Reviewed-by: NPeter Ujfalusi <peter.ujfalusi@ti.com>
      Tested-by: NPeter Ujfalusi <peter.ujfalusi@ti.com>
      Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Stable <stable@vger.kernel.org> # v3.4+
      58b116bc
    • H
      KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address. · 30c21170
      Haibin Wang 提交于
      Currently below check in vgic_ioaddr_overlap will always succeed,
      because the vgic dist base and vgic cpu base are still kept UNDEF
      after initialization. The code as follows will be return forever.
      
      	if (IS_VGIC_ADDR_UNDEF(dist) || IS_VGIC_ADDR_UNDEF(cpu))
                      return 0;
      
      So, before invoking the vgic_ioaddr_overlap, it needs to set the
      corresponding base address firstly.
      Signed-off-by: NHaibin Wang <wanghaibin.wang@huawei.com>
      Acked-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NChristoffer Dall <christoffer.dall@linaro.org>
      30c21170