Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 16, 2012
  1. @torvalds

    Linux 3.4-rc3

    torvalds authored
  2. @torvalds

    Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    torvalds authored
    Pull ARM fixes from Russell King:
     "Nothing too disasterous, the biggest thing being the removal of the
      regulator support for vcore in the AMBA driver; only one SoC was using
      this and it got broken during the last merge window, which then
      started causing problems for other people.  Mutual agreement was
      reached for it to be removed."
    
    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
      ARM: 7386/1: jump_label: fixup for rename to static_key
      ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
      ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
      ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
      ARM: 7383/1: nommu: populate vectors page from paging_init
      ARM: 7381/1: nommu: fix typo in mm/Kconfig
      ARM: 7380/1: DT: do not add a zero-sized memory property
      ARM: 7379/1: DT: fix atags_to_fdt() second call site
      ARM: 7366/3: amba: Remove AMBA level regulator support
      ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
      ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
  3. @torvalds

    x86-32: fix up strncpy_from_user() sign error

    torvalds authored
    The 'max' range needs to be unsigned, since the size of the user address
    space is bigger than 2GB.
    
    We know that 'count' is positive in 'long' (that is checked in the
    caller), so we will truncate 'max' down to something that fits in a
    signed long, but before we actually do that, that comparison needs to be
    done in unsigned.
    
    Bug introduced in commit 92ae03f ("x86: merge 32/64-bit versions of
    'strncpy_from_user()' and speed it up").  On x86-64 you can't trigger
    this, since the user address space is much smaller than 63 bits, and on
    x86-32 it works in practice, since you would seldom hit the strncpy
    limits anyway.
    
    I had actually tested the corner-cases, I had only tested them on
    x86-64.  Besides, I had only worried about the case of a pointer *close*
    to the end of the address space, rather than really far away from it ;)
    
    This also changes the "we hit the user-specified maximum" to return
    'res', for the trivial reason that gcc seems to generate better code
    that way.  'res' and 'count' are the same in that case, so it really
    doesn't matter which one we return.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 15, 2012
  1. @rabinv

    ARM: 7386/1: jump_label: fixup for rename to static_key

    rabinv authored Russell King committed
    c5905af ("static keys: Introduce 'struct static_key'...") renamed
    struct jump_label_key to struct static_key.  Fixup ARM for this to
    eliminate these build warnings:
    
      include/linux/jump_label.h:113:2:
      warning: passing argument 1 of 'arch_static_branch' from incompatible pointer type
      include/asm/jump_label.h:17:82:
      note: expected 'struct jump_label_key *' but argument is of type 'struct static_key *'
    
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  2. @jaustin

    ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM…

    jaustin authored Russell King committed
    …_THUMBEE
    
    Currently when ThumbEE is not enabled (!CONFIG_ARM_THUMBEE) the ThumbEE
    register states are not saved/restored at context switch. The default state
    of the ThumbEE Ctrl register (TEECR) allows userspace accesses to the
    ThumbEE Base Handler register (TEEHBR). This can cause unexpected behaviour
    when people use ThumbEE on !CONFIG_ARM_THUMBEE kernels, as well as allowing
    covert communication - eg between userspace tasks running inside chroot
    jails.
    
    This patch sets up TEECR in order to prevent user-space access to TEEHBR
    when !CONFIG_ARM_THUMBEE. In this case, tasks are sent SIGILL if they try to
    access TEEHBR.
    
    Cc: stable@vger.kernel.org
    Reviewed-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  3. @wildea01

    ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classi…

    wildea01 authored Russell King committed
    …c MMU
    
    If a bank of memory spanning the 4GB boundary is added on a !CONFIG_LPAE
    kernel then we will hang early during boot since the memory bank will
    have wrapped around to zero.
    
    This patch truncates memory banks for !LPAE configurations when the end
    address is not representable in 32 bits.
    
    Acked-by: Nicolas Pitre <nico@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  4. @linusw

    ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus

    linusw authored Russell King committed
    During booting of cpu1, there is a short window where cpu1
    is online, but not active where cpu1 is occupied by waiting
    to become active. If cpu0 then decides to schedule something
    on cpu1 and wait for it to complete, before cpu0 has set
    cpu1 active, we have a deadlock.
    
    Typically it's this CPU frequency transition that happens at
    this time, so let's just not wait for it to happen, it will
    happen whenever the CPU eventually comes online instead.
    
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: stable@kernel.org
    Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
    Reviewed-by: Rickard Andersson <rickard.andersson@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  5. @rjwysocki @torvalds

    PCI: Fix regression in pci_restore_state(), v3

    rjwysocki authored torvalds committed
    Commit 26f4106 ("PCI: check for pci bar restore completion and
    retry") attempted to address problems with PCI BAR restoration on
    systems where FLR had not been completed before pci_restore_state() was
    called, but it did that in an utterly wrong way.
    
    First off, instead of retrying the writes for the BAR registers only, it
    did that for all of the PCI config space of the device, including the
    status register (whose value after the write quite obviously need not be
    the same as the written one).  Second, it added arbitrary delay to
    pci_restore_state() even for systems where the PCI config space
    restoration was successful at first attempt.  Finally, the mdelay(10) it
    added to every iteration of the writing loop was way too much of a delay
    for any reasonable device.
    
    All of this actually caused resume failures for some devices on Mikko's
    system.
    
    To fix the regression, make pci_restore_state() only retry the writes
    for BAR registers and only wait if the first read from the register
    doesn't return the written value.  Additionaly, make it wait for 1 ms,
    instead of 10 ms, after every failing attempt to write into config
    space.
    
    Reported-by: Mikko Vinni <mmvinni@yahoo.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/arm/arm-soc
    
    Pull "ARM: a few more SoC fixes for 3.4-rc" from Olof Johansson:
     - A handful of warning and build fixes for Qualcomm MSM
     - Build/warning and bug fixes for Samsung Exynos
     - A fix from Rob Herring that removes misplaced interrupt-parent
       properties from a few device trees
     - A fix to OMAP dealing with cpufreq build errors, removing some of the
       offending code since it was redundant anyway
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: OMAP: clock: cleanup CPUfreq leftovers, fix build errors
      ARM: dts: remove blank interrupt-parent properties
      ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
      ARM: EXYNOS: Remove broken config values for touchscren for NURI board
      ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
      ARM: EXYNOS: fix regulator name for NURI board
      ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
      ARM: msm: Fix section mismatches in proc_comm.c
      video: msm: Fix section mismatches in mddi.c
      arm: msm: trout: fix compile failure
      arm: msm: halibut: remove unneeded fixup
      ARM: EXYNOS: Add PDMA and MDMA physical base address defines
      ARM: S5PV210: Fix compiler warning in dma.c file
      ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
      ARM: EXYNOS: Add missing definition for IRQ_I2S0
      ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
  7. @torvalds

    Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/tiwai/sound
    
    Pull another round of sound fixes from Takashi Iwai:
     "A few regression fixes for Realtek HD-audio codecs, mainly specific to
      some laptop models."
    
    * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: hda/realtek - Fix mem leak (and rid us of trailing whitespace).
      ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines
      ALSA: hda/realtek - Add a fixup entry for Acer Aspire 8940G
      ALSA: hda/realtek - Fix GPIO1 setup for Acer Aspire 4930 & co
      ALSA: hda/realtek - Add a few ALC882 model strings back
  8. @torvalds

    SCSI: Fix error handling when no ULD is attached

    Martin K. Petersen authored torvalds committed
    Commit 18a4d0a ("[SCSI] Handle disk devices which can not process
    medium access commands") introduced a bug in which we would attempt to
    dereference the scsi driver even when the device had no ULD attached.
    
    Ensure that a driver is registered and make the driver accessor function
    more resilient to errors during device discovery.
    
    Reported-by: Elric Fu <elricfu1@gmail.com>
    Reported-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @olofj

    Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/l…

    olofj authored
    …inux/kernel/git/kgene/linux-samsung into fixes
    
    * 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
      ARM: EXYNOS: Remove broken config values for touchscren for NURI board
      ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
      ARM: EXYNOS: fix regulator name for NURI board
      ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
      ARM: EXYNOS: Add PDMA and MDMA physical base address defines
      ARM: S5PV210: Fix compiler warning in dma.c file
      ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
      ARM: EXYNOS: Add missing definition for IRQ_I2S0
      ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
  10. @olofj

    ARM: OMAP: clock: cleanup CPUfreq leftovers, fix build errors

    Kevin Hilman authored olofj committed
    Now that we have OPP layer, and OMAP CPUfreq driver is using it, we no
    longer need/use the clock framework code for filling up CPUfreq
    tables.  Remove it.
    
    Removing this code also eliminates build errors when CPU_FREQ_TABLE
    support is not enabled.
    
    Thanks to Russell King for pointing out the parts I missed under
    plat-omap in the original version and also pointing out the build
    errors when CPUFREQ_TABLE support was not enabled.
    
    Cc: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Kevin Hilman <khilman@ti.com>
    Acked-by: Paul Walmsley <paul@pwsan.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  11. @olofj

    ARM: dts: remove blank interrupt-parent properties

    Rob Herring authored olofj committed
    These were incorrectly introduced and can cause problems for of_irq_init.
    
    The correct way to define a root controller is no interrupt-parent set at
    all or the interrupt-parent is set to the root controller itself when
    inherited from a parent node.
    
    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Tested-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  12. @olofj

    Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/g…

    olofj authored
    …it/davidb/linux-msm into fixes
    
    From David Brown:
      "Here are some fixes for msm that fix problems caused by the latest
       ARM code.  The ones from Daniel remove unneeded fixups that now
       cause compilation failures.  Mine fix section mismatches, that were
       incompletely fixed earlier."
    
    * 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
      ARM: msm: Fix section mismatches in proc_comm.c
      video: msm: Fix section mismatches in mddi.c
      arm: msm: trout: fix compile failure
      arm: msm: halibut: remove unneeded fixup
Commits on Apr 14, 2012
  1. @kgene

    ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine…

    Sachin Kamat authored kgene committed
    … files
    
    Add config dependency for Exynos4 and Exynos5 device tree enabled machine
    files on config options ARCH_EXYNOS4 and ARCH_EXYNOS5 respectively.
    Enabling machine support without proper ARCH support enabled is incorrect.
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  2. @torvalds

    Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/tip
    
    Pull perf tool fixes from Ingo Molnar.
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      perf kvm: Finding struct machine fails for PERF_RECORD_MMAP
      perf annotate: Validate addr in symbol__inc_addr_samples
      perf hists browser: Fix NULL deref in hists browsing code
      perf hists: Catch and handle out-of-date hist entry maps.
      perf annotate: Fix hist decay
      perf top: Add intel_idle to the skip list
  3. @torvalds

    do not export kernel's NULL #define to userspace

    Lubos Lunak authored torvalds committed
    GCC's NULL is actually __null, which allows detecting some questionable
    NULL usage and warn about it.  Moreover each platform/compiler should
    have its own stddef.h anyway (which is different from linux/stddef.h).
    
    So there's no good reason to leak kernel's NULL to userspace and
    override what the compiler provides.
    
    Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @kgene

    ARM: EXYNOS: Remove broken config values for touchscren for NURI board

    Marek Szyprowski authored kgene committed
    The atmel_mxt_ts driver has been extended to support more 'configuration
    objects' in commit 81c88a7 ("Input: atmel_mxt_ts - update object list"),
    what broke the configuration values for NURI board. These values are
    optional anyway, so remove them to get the driver working correctly.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  5. @kgene

    ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards

    Marek Szyprowski authored kgene committed
    On some versions of NURI and UniversalC210 boards, camera clocks are
    routed directly to xusbxti clock source. This patch sets the correct
    value for this clock to let usb and camera sensors to work correctly and
    avoid division by zero on driver's probe.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  6. @kgene

    ARM: EXYNOS: fix regulator name for NURI board

    Marek Szyprowski authored kgene committed
    Regulator names should not contain slash to avoid issues with debugfs.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  7. @mcuelenaere @kgene

    ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL

    mcuelenaere authored kgene committed
    When selecting SAMSUNG_PM_DEBUG, it complains about a missing printascii()
    function if you do not select DEBUG_LL, so make the former select the latter.
    
    Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
    Acked-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  8. @torvalds

    Merge branch 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/paulg/linux
    
    Pull system.h fixups for less common arch's from Paul Gortmaker:
     "Here is what is hopefully the last of the system.h related fixups.
    
      The fixes for Alpha and ia64 are code relocations consistent with what
      was done for the more mainstream architectures.  Note that the
      diffstat lines removed vs lines added are not the same since I've
      fixed some of the whitespace issues in the relocated code blocks.
      However they are functionally the same.  Compile tested locally, plus
      these two have been in linux-next for a while.
    
      There is also a trivial one line system.h related fix for the Tilera
      arch from Chris Metcalf to fix an implict include.."
    
    * 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
      irq_work: fix compile failure on tile from missing include
      ia64: populate the cmpxchg header with appropriate code
      alpha: fix build failures from system.h dismemberment
  9. @torvalds

    Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linu…

    torvalds authored
    …x-2.6
    
    Pull fbdev fixes from Florian Tobias Schandinat:
     - a compile fix for au1*fb
     - a fix to make kyrofb usable on x86_64
     - a fix for uvesafb to prevent an oops due to NX-protection
    
     "The fix for kyrofb is a bit large but it's just replacing "unsigned
      long" by "u32" for 64 bit compatibility."
    
    * tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6:
      video:uvesafb: Fix oops that uvesafb try to execute NX-protected page
      fbdev: fix au1*fb builds
      kyrofb: fix on x86_64
  10. @torvalds

    Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/mason/linux-btrfs
    
    Pull the minimal btrfs branch from Chris Mason:
     "We have a use-after-free in there, along with errors when mount -o
      discard is enabled, and a BUG_ON(we should compile with UP more
      often)."
    
    * 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: use commit root when loading free space cache
      Btrfs: fix use-after-free in __btrfs_end_transaction
      Btrfs: check return value of bio_alloc() properly
      Btrfs: remove lock assert from get_restripe_target()
      Btrfs: fix eof while discarding extents
      Btrfs: fix uninit variable in repair_eb_io_failure
      Revert "Btrfs: increase the global block reserve estimates"
  11. @torvalds

    Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block

    torvalds authored
    Pull block driver bits from Jens Axboe:
    
     - A series of fixes for mtip32xx.  Most from Asai at Micron, but also
       one from Greg, getting rid of the dependency on PCIE_HOTPLUG.
    
     - A few bug fixes for xen-blkfront, and blkback.
    
     - A virtio-blk fix for Vivek, making resize actually work.
    
     - Two fixes from Stephen, making larger transfers possible on cciss.
       This is needed for tape drive support.
    
    * 'for-3.4/drivers' of git://git.kernel.dk/linux-block:
      block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy
      mtip32xx: dump tagmap on failure
      mtip32xx: fix handling of commands in various scenarios
      mtip32xx: Shorten macro names
      mtip32xx: misc changes
      mtip32xx: Add new sysfs entry 'status'
      mtip32xx: make setting comp_time as common
      mtip32xx: Add new bitwise flag 'dd_flag'
      mtip32xx: fix error handling in mtip_init()
      virtio-blk: Call revalidate_disk() upon online disk resize
      xen/blkback: Make optional features be really optional.
      xen/blkback: Squash the discard support for 'file' and 'phy' type.
      mtip32xx: fix incorrect value set for drv_cleanup_done, and re-initialize and start port in mtip_restart_port()
      cciss: Fix scsi tape io with more than 255 scatter gather elements
      cciss: Initialize scsi host max_sectors for tape drive support
      xen-blkfront: make blkif_io_lock spinlock per-device
      xen/blkfront: don't put bdev right after getting it
      xen-blkfront: use bitmap_set() and bitmap_clear()
      xen/blkback: Enable blkback on HVM guests
      xen/blkback: use grant-table.c hypercall wrappers
  12. @torvalds

    Merge branch 'for-3.4/core' of git://git.kernel.dk/linux-block

    torvalds authored
    Pull block core bits from Jens Axboe:
     "It's a nice and quiet round this time, since most of the tricky stuff
      has been pushed to 3.5 to give it more time to mature.  After a few
      hectic block IO core changes for 3.3 and 3.2, I'm quite happy with a
      slow round.
    
      Really minor stuff in here, the only real functional change is making
      the auto-unplug threshold a per-queue entity.  The threshold is set so
      that it's low enough that we don't hold off IO for too long, but still
      big enough to get a nice benefit from the batched insert (and hence
      queue lock cost reduction).  For raid configurations, this currently
      breaks down."
    
    * 'for-3.4/core' of git://git.kernel.dk/linux-block:
      block: make auto block plug flush threshold per-disk based
      Documentation: Add sysfs ABI change for cfq's target latency.
      block: Make cfq_target_latency tunable through sysfs.
      block: use lockdep_assert_held for queue locking
      block: blk_alloc_queue_node(): use caller's GFP flags instead of GFP_KERNEL
  13. @torvalds

    cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS

    Kevin Hilman authored torvalds committed
    The OMAP driver needs a 'depends on ARCH_OMAP2PLUS' since it only
    builds for OMAP2+ platforms.
    
    This 'depends on' was in the original patch from Russell King, but was
    erroneously removed by me when making this option user-selectable in
    commit b09db45 (cpufreq: OMAP driver depends CPUfreq tables.)  This
    patch remedies that.
    
    Apologies to Russell King for breaking his originally working patch.
    
    Also, thanks to Grazvydas Ignotas for reporting the same problem.
    
    Cc: Russell King <rmk+kernel@arm.linux.org.uk>
    Cc: Grazvydas Ignotas <notasas@gmail.com>
    Signed-off-by: Kevin Hilman <khilman@ti.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 13, 2012
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

    torvalds authored
    Pull sparc fixes from David Miller.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc64: Eliminate obsolete __handle_softirq() function
      sparc64: Fix bootup crash on sun4v.
  2. @torvalds

    Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/groeck/linux-staging
    
    Pull hwmon patches from Guenter Roeck:
     "Fix build warnings in four drivers"
    
    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
      hwmon: (pmbus_core) Fix compiler warning
      hwmon: (smsc47m1) Fix compiler warning
      hwmon: (acpi_power_meter) Fix compiler warning seen in some configurations
      hwmon: (smsc47b397) Fix compiler warning
  3. @torvalds

    Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

    torvalds authored
    Pull GPIO bug fixes from Grant Likely:
     "Miscellaneous bug fixes to GPIO drivers and for a corner case in the
      gpio device tree parsing code."
    
    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
      gpio/exynos: Fix compiler warning in gpio-samsung.c file
      gpio: Fix range check in of_gpio_simple_xlate()
      gpio: Fix uninitialized variable bit in adp5588_irq_handler
      gpio/sodaville: Convert sodaville driver to new irqdomain API
  4. @torvalds

    Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

    torvalds authored
    Pull SPI bug fixes from Grant Likely:
     "Miscellaneous driver bug fixes.  No major changes in this branch."
    
    * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
      spi/imx: prevent NULL pointer dereference in spi_imx_probe()
      spi/imx: mark base member in spi_imx_data as __iomem
      spi/mpc83xx: fix NULL pdata dereference bug
      spi/davinci: Fix DMA API usage in davinci
      spi/pL022: include types.h to remove compilation warnings
  5. @paulmck @davem330

    sparc64: Eliminate obsolete __handle_softirq() function

    paulmck authored davem330 committed
    The invocation of softirq is now handled by irq_exit(), so there is no
    need for sparc64 to invoke it on the trap-return path.  In fact, doing so
    is a bug because if the trap occurred in the idle loop, this invocation
    can result in lockdep-RCU failures.  The problem is that RCU ignores idle
    CPUs, and the sparc64 trap-return path to the softirq handlers fails to
    tell RCU that the CPU must be considered non-idle while those handlers
    are executing.  This means that RCU is ignoring any RCU read-side critical
    sections in those handlers, which in turn means that RCU-protected data
    can be yanked out from under those read-side critical sections.
    
    The shiny new lockdep-RCU ability to detect RCU read-side critical sections
    that RCU is ignoring located this problem.
    
    The fix is straightforward: Make sparc64 stop manually invoking the
    softirq handlers.
    
    Reported-by: Meelis Roos <mroos@linux.ee>
    Suggested-by: David Miller <davem@davemloft.net>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Tested-by: Meelis Roos <mroos@linux.ee>
    Cc: stable@vger.kernel.org
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    sparc64: Fix bootup crash on sun4v.

    davem330 authored
    The DS driver registers as a subsys_initcall() but this can be too
    early, in particular this risks registering before we've had a chance
    to allocate and setup module_kset in kernel/params.c which is
    performed also as a subsyts_initcall().
    
    Register DS using device_initcall() insteal.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Cc: stable@vger.kernel.org
  7. ARM: msm: Fix section mismatches in proc_comm.c

    David Brown authored
    The change
        commit 4416e9e
        Author: Gregory Bean <gbean@codeaurora.org>
        Date:   Wed Jul 28 10:22:12 2010 -0700
    
            arm: msm: Fix section mismatch in smd.c.
    
    fixes a section mismatch between the board file and the smd driver's
    probe function, however, it misses the additional mismatches between
    the probe function and some routines it calls.  Fix these up as well.
    
    Signed-off-by: David Brown <davidb@codeaurora.org>
Something went wrong with that request. Please try again.