1. 26 9月, 2013 11 次提交
    • D
      mmc: dw_mmc: don't queue up a card detect at slot startup · 369ac861
      Doug Anderson 提交于
      The MMC subsystem handles looking for a card at probe time. Queuing up our
      own can race with the rest of the MMC subsystem and cause problems if we
      get unlucky with timing. Just remove driver own detection triggering.  While
      progressing the request from 'mmc_rescan', if 'dw_mci_work_routine_card'
      routine is activated, it will cancel the current request. The problem case
      is that 'mmc_rescan' is prior to 'dw_mci_work_routine_card' from host own.
      Specifically, the following message shows the detection problem in driver's
      probing. It would get an err -123 (-ENOMEDIUM) during probe.
      
      [    4.216595] dwmmc_exynos 12210000.dwmmc1: Using internal DMA controller.
      [    4.395935] dwmmc_exynos 12210000.dwmmc1: Version ID is 250a
      [    4.401948] dwmmc_exynos 12210000.dwmmc1: DW MMC controller at irq 108, 64 bit host data width, 64 deep fifo
      [    4.424430] dwmmc_exynos 12210000.dwmmc1: sdr0 mode (irq=108, width=0)
      [    4.453975] dwmmc_exynos 12210000.dwmmc1: sdr0 mode (irq=108, width=0)
      [    4.459592] mmc_host mmc1: Bus speed (slot 0) = 100000000Hz (slot req 400000Hz, actual 400000HZ div = 125)
      [    4.484258] dwmmc_exynos 12210000.dwmmc1: 1 slots initialized
      [    4.485406] dwmmc_exynos 12210000.dwmmc1: sdr0 mode (irq=108, width=0)
      [    4.487606] dwmmc_exynos 12210000.dwmmc1: sdr0 mode (irq=108, width=0)
      [    4.489794] dwmmc_exynos 12210000.dwmmc1: sdr0 mode (irq=108, width=0)
      [    4.509757] mmc1: error -123 whilst initialising SDIO card
      Signed-off-by: NDoug Anderson <dianders@chromium.org>
      Acked-by: NSeungwon Jeon <tgih.jun@samsung.com>
      Signed-off-by: NChris Ball <cjb@laptop.org>
      369ac861
    • K
      sh: ecovec: fixup compile error on sdhi · 357002b9
      Kuninori Morimoto 提交于
      afa2c940 ("sh: ecovec24: Use MMC/SDHI CD and RO GPIO") added
      .tmio_flags = TMIO_MMC_USE_GPIO_CD on sh_mobile_sdhi_info, but it needs
      <linux/mfd/tmio.h> header.  This patch adds it.
      Signed-off-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Reviewed-by: NYusuke Goda <yusuke.goda.sx@renesas.com>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: NChris Ball <cjb@laptop.org>
      357002b9
    • G
      mmc: core: remove dead function mmc_try_claim_host · b83e8670
      Grant Grundler 提交于
      cscope says there are no callers for mmc_try_claim_host in the kernel.
      No reason to keep it.
      Signed-off-by: NGrant Grundler <grundler@chromium.org>
      Acked-by: NUlf Hansson <ulf.hansson@linaro.org>
      Signed-off-by: NChris Ball <cjb@laptop.org>
      b83e8670
    • L
      Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 4b972806
      Linus Torvalds 提交于
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "Bug-fixes and one update to the kernel-paramters.txt documentation.
      
         - Fix PV spinlocks triggering jump_label code bug
         - Remove extraneous code in the tpm front driver
         - Fix ballooning out of pages when non-preemptible
         - Fix deadlock when using a 32-bit initial domain with large amount
           of memory
         - Add xen_nopvpsin parameter to the documentation"
      
      * tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/spinlock: Document the xen_nopvspin parameter.
        xen/p2m: check MFN is in range before using the m2p table
        xen/balloon: don't alloc page while non-preemptible
        xen: Do not enable spinlocks before jump_label_init() has executed
        tpm: xen-tpmfront: Remove the locality sysfs attribute
        tpm: xen-tpmfront: Fix default durations
      4b972806
    • L
      Merge tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · e93dd910
      Linus Torvalds 提交于
      Pull device-mapper fixes from Mike Snitzer:
       "A few fixes for dm-snapshot, a 32 bit fix for dm-stats, a couple error
        handling fixes for dm-multipath.  A fix for the thin provisioning
        target to not expose non-zero discard limits if discards are disabled.
      
        Lastly, add two DM module parameters which allow users to tune the
        emergency memory reserves that DM mainatins per device -- this helps
        fix a long-standing issue for dm-multipath.  The conservative default
        reserve for request-based dm-multipath devices (256) has proven
        problematic for users with many multipathed SCSI devices but
        relatively little memory.  To responsibly select a smaller value users
        should use the new nr_bios tracepoint info (via commit 75afb352
        "block: Add nr_bios to block_rq_remap tracepoint") to determine the
        peak number of bios their workloads create"
      
      * tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: add reserved_bio_based_ios module parameter
        dm: add reserved_rq_based_ios module parameter
        dm: lower bio-based mempool reservation
        dm thin: do not expose non-zero discard limits if discards disabled
        dm mpath: disable WRITE SAME if it fails
        dm-snapshot: fix performance degradation due to small hash size
        dm snapshot: workaround for a false positive lockdep warning
        dm stats: fix possible counter corruption on 32-bit systems
        dm mpath: do not fail path on -ENOSPC
      e93dd910
    • L
      Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus · b4820416
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
      
       - Fix a comment
      
       - A small cleanup the main purpose of which is to work around an
         internal compiler error bug in certain Codesource toolchains.
      
      * git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: mm: Move some checks out of 'for' loop in DMA operations
        MIPS: cpu-features.h: s/MIPS53/MIPS64/
      b4820416
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 06367d58
      Linus Torvalds 提交于
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here are a few things for -rc2, this time it's all written by me so it
        can only be perfect .... right ? :)
      
        So we have the fix to call irq_enter/exit on the irq stack we've been
        discussing, plus a cleanup on top to remove an unused (and broken)
        stack limit tracking feature (well, make it 32-bit only in fact where
        it is used and works properly).
      
        Then we have two things that I wrote over the last couple of days and
        made the executive decision to include just because I can (and I'm
        sure you won't object .... right ?).
      
        They fix a couple of annoying and long standing "issues":
      
         - We had separate zImages for when booting via Open Firmware vs.
           booting via a flat device-tree, while it's trivial to make one that
           deals with both
      
         - We wasted a ton of cycles spinning secondary CPUs uselessly at boot
           instead of starting them when needed on pseries, thus contributing
           significantly to global warming"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/pseries: Do not start secondaries in Open Firmware
        powerpc/zImage: make the "OF" wrapper support ePAPR boot
        powerpc: Remove ksp_limit on ppc64
        powerpc/irq: Run softirqs off the top of the irq stack
      06367d58
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 654fdd04
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "An EFI fix and two reboot-quirk fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
        x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
        x86, efi: Don't map Boot Services on i386
      654fdd04
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82dfaa58
      Linus Torvalds 提交于
      Pull scheduler fixes from Ingo Molnar:
       "Three small fixes"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/balancing: Fix cfs_rq->task_h_load calculation
        sched/balancing: Fix 'local->avg_load > busiest->avg_load' case in fix_small_imbalance()
        sched/balancing: Fix 'local->avg_load > sds->avg_load' case in calculate_imbalance()
      82dfaa58
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bdc5663f
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "Assorted standalone fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel: Add model number for Avoton Silvermont
        perf: Fix capabilities bitfield compatibility in 'struct perf_event_mmap_page'
        perf/x86/intel/uncore: Don't use smp_processor_id() in validate_group()
        perf: Update ABI comment
        tools lib lk: Uninclude linux/magic.h in debugfs.c
        perf tools: Fix old GCC build error in trace-event-parse.c:parse_proc_kallsyms()
        perf probe: Fix finder to find lines of given function
        perf session: Check for SIGINT in more loops
        perf tools: Fix compile with libelf without get_phdrnum
        perf tools: Fix buildid cache handling of kallsyms with kcore
        perf annotate: Fix objdump line parsing offset validation
        perf tools: Fill in new definitions for madvise()/mmap() flags
        perf tools: Sharpen the libaudit dependencies test
      bdc5663f
    • M
      update contact information for Mikael Pettersson · 743a7ecb
      Mikael Pettersson 提交于
      My old @it.uu.se email address is going away, so update relevant
      files to point to my @gmail.com address instead.  In sata_promise.c
      just delete the address, people can get it from MAINTAINERS.
      Signed-off-by: NMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      743a7ecb
  2. 25 9月, 2013 29 次提交