1. 21 Apr, 2008 7 commits
    • Linus Torvalds's avatar
      Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc · 429f731d
      Linus Torvalds authored
      * 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
        Deprecate the asm/semaphore.h files in feature-removal-schedule.
        Convert asm/semaphore.h users to linux/semaphore.h
        security: Remove unnecessary inclusions of asm/semaphore.h
        lib: Remove unnecessary inclusions of asm/semaphore.h
        kernel: Remove unnecessary inclusions of asm/semaphore.h
        include: Remove unnecessary inclusions of asm/semaphore.h
        fs: Remove unnecessary inclusions of asm/semaphore.h
        drivers: Remove unnecessary inclusions of asm/semaphore.h
        net: Remove unnecessary inclusions of asm/semaphore.h
        arch: Remove unnecessary inclusions of asm/semaphore.h
      429f731d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 85b375a6
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (212 commits)
        [ARM] pxa: Phycore pcm-990-specific code for the PXA270 Quick Capture driver
        [ARM] pxa: V4L2 soc_camera driver for PXA270
        [ARM] pxa: restrict availability of pxa2xx PCMCIA drivers
        [ARM] 5005/1: BAST: Fix kset_name initialiser
        [ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410
        [ARM] 4988/1: Add GPIO lib support to the EP93xx
        [ARM] Add initial sparsemem support
        [ARM] pxa: initialise PXA devices before platform init code
        [ARM] 5002/1: tosa: add two more leds
        [ARM] 5004/1: Tosa: make several unreferenced structures static.
        [ARM] 5003/1: Shut up sparse warnings
        [ARM] 4977/2: soc - pxa2xx-ac97 - Add missing clk_enable()
        [ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line
        [ARM] 4974/1: Drop unused leds-tosa.
        [ARM] 4973/1: Tosa: use leds-gpio driver.
        [ARM] 4972/1: Tosa: convert scoop GPIOs usage to generic gpio code
        [ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks
        [ARM] pxa: lubbock: move mis-placed SPI info
        [ARM] 4970/1: tosa: correct gpio used for wake up.
        [ARM] 4966/1: magician: add MFP pin configuration
        ...
      85b375a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · ec965350
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: (62 commits)
        sched: build fix
        sched: better rt-group documentation
        sched: features fix
        sched: /debug/sched_features
        sched: add SCHED_FEAT_DEADLINE
        sched: debug: show a weight tree
        sched: fair: weight calculations
        sched: fair-group: de-couple load-balancing from the rb-trees
        sched: fair-group scheduling vs latency
        sched: rt-group: optimize dequeue_rt_stack
        sched: debug: add some debug code to handle the full hierarchy
        sched: fair-group: SMP-nice for group scheduling
        sched, cpuset: customize sched domains, core
        sched, cpuset: customize sched domains, docs
        sched: prepatory code movement
        sched: rt: multi level group constraints
        sched: task_group hierarchy
        sched: fix the task_group hierarchy for UID grouping
        sched: allow the group scheduler to have multiple levels
        sched: mix tasks and groups
        ...
      ec965350
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 · 5f033bb9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (77 commits)
        x86: UV startup of slave cpus
        x86: integrate pci-dma.c
        x86: don't do dma if mask is NULL.
        x86: return conditional to mmu
        x86: remove kludge from x86_64
        x86: unify gfp masks
        x86: retry allocation if failed
        x86: don't try to allocate from DMA zone at first
        x86: use a fallback dev for i386
        x86: use numa allocation function in i386
        x86: remove virt_to_bus in pci-dma_64.c
        x86: adjust dma_free_coherent for i386
        x86: move bad_dma_address
        x86: isolate coherent mapping functions
        x86: move dma_coherent functions to pci-dma.c
        x86: merge iommu initialization parameters
        x86: merge dma_supported
        x86: move pci fixup to pci-dma.c
        x86: move x86_64-specific to common code.
        x86: move initialization functions to pci-dma.c
        ...
      5f033bb9
    • Linus Torvalds's avatar
      Merge branch 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · fd9be4ce
      Linus Torvalds authored
      * 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (24 commits)
        [PATCH] r/o bind mounts: debugging for missed calls
        [PATCH] r/o bind mounts: honor mount writer counts at remount
        [PATCH] r/o bind mounts: track numbers of writers to mounts
        [PATCH] r/o bind mounts: check mnt instead of superblock directly
        [PATCH] r/o bind mounts: elevate count for xfs timestamp updates
        [PATCH] r/o bind mounts: make access() use new r/o helper
        [PATCH] r/o bind mounts: write counts for truncate()
        [PATCH] r/o bind mounts: elevate write count for chmod/chown callers
        [PATCH] r/o bind mounts: elevate write count for open()s
        [PATCH] r/o bind mounts: elevate write count for ioctls()
        [PATCH] r/o bind mounts: write count for file_update_time()
        [PATCH] r/o bind mounts: elevate write count for do_utimes()
        [PATCH] r/o bind mounts: write counts for touch_atime()
        [PATCH] r/o bind mounts: elevate write count for ncp_ioctl()
        [PATCH] r/o bind mounts: elevate write count for xattr_permission() callers
        [PATCH] r/o bind mounts: get write access for vfs_rename() callers
        [PATCH] r/o bind mounts: write counts for link/symlink
        [PATCH] r/o bind mounts: get callers of vfs_mknod/create/mkdir()
        [PATCH] r/o bind mounts: elevate write count for rmdir and unlink.
        [PATCH] r/o bind mounts: drop write during emergency remount
        ...
      fd9be4ce
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · b1af9ccc
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (27 commits)
        sh: Fix up L2 cache probe.
        sh: Fix up SH-4A part probe.
        sh: Add support for SH7723 CPU subtype.
        sh: Fix up SH7763 build.
        sh: Add migor_ts support to MigoR
        sh: Add rs5c732b RTC support to MigoR
        sh: Add I2C support to MigoR
        sh: Add I2C platform data to sh7722
        sh: MigoR NAND flash support using gen_flash
        sh: MigoR NOR flash support using physmap-flash
        sh: Fix up mach-types formatting from merge damage.
        sh: r7780rp: Hook up the I2C and SMBus platform devices.
        sh: Use phyical addresses for MigoR smc91x resources
        sh: Use physical addresses for sh7722 USBF resources
        sh: Add MigoR header file
        Fix sh_keysc double free
        sh: Fix up __access_ok() check for nommu.
        sh: Allow optimized clear/copy page routines to be used on SH-2.
        sh: Hook up the rest of the SH7770 serial ports.
        sh: Add support for Solution Engine SH7721 board
        ...
      b1af9ccc
    • Linus Torvalds's avatar
      Fix RCU list iterator use of 'rcu_dereference()' · cc216c5d
      Linus Torvalds authored
      The RCU iterators used 'rcu_dereference()' on an already-fetched RCU
      pointer value, which defeats the whole point of the exercise.
      
      When we dereference a pointer protected by RCU, we need to make sure
      that we only fetch the value _once_, because if the compiler ends up
      re-loading it due to register pressure, the newly reloaded value could
      be different from the previously fetched one, and you get inconsistent
      results.
      
      Cleaned-up, fixed, and the pointless list_for_each_safe_rcu #define
      deleted by Paul Kenney.
      Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cc216c5d
  2. 19 Apr, 2008 33 commits