Permalink
Commits on Apr 22, 2009
  1. @torvalds

    Linux 2.6.30-rc3

    torvalds committed Apr 22, 2009
  2. @fenrus75 @torvalds

    driver synchronization: make scsi_wait_scan more advanced

    There is currently only one way for userspace to say "wait for my storage
    device to get ready for the modules I just loaded": to load the
    scsi_wait_scan module. Expectations of userspace are that once this
    module is loaded, all the (storage) devices for which the drivers
    were loaded before the module load are present.
    
    Now, there are some issues with the implementation, and the async
    stuff got caught in the middle of this: The existing code only
    waits for the scsy async probing to finish, but it did not take
    into account at all that probing might not have begun yet.
    (Russell ran into this problem on his computer and the fix works for him)
    
    This patch fixes this more thoroughly than the previous "fix", which
    had some bad side effects (namely, for kernel code that wanted to wait for
    the scsi scan it would also do an async sync, which would deadlock if you did
    it from async context already.. there's a report about that on lkml):
    The patch makes the module first wait for all device driver probes, and then it
    will wait for the scsi parallel scan to finish.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    fenrus75 committed with torvalds Apr 21, 2009
  3. @torvalds

    Trivial: fix a typo in slow-work.h

    Fix a comment typo in slow-work.h
    
    ...a trivial mistake, but it will mess up kerneldoc if nothing else.
    
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jonathan Corbet committed with torvalds Apr 21, 2009
  4. @torvalds

    PERCPU: Collect the DECLARE/DEFINE declarations together

    Collect the DECLARE/DEFINE declarations together in linux/percpu-defs.h so
    that they're in one place, and give them descriptive comments, particularly
    the SHARED_ALIGNED variant.
    
    It would be nice to collect these in linux/percpu.h, but that's not possible
    without sorting out the severe #include recursion between the x86 arch headers
    and the general headers (and possibly other arches too).
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Apr 21, 2009
  5. @torvalds

    FRV: Fix the section attribute on UP DECLARE_PER_CPU()

    In non-SMP mode, the variable section attribute specified by DECLARE_PER_CPU()
    does not agree with that specified by DEFINE_PER_CPU().  This means that
    architectures that have a small data section references relative to a base
    register may throw up linkage errors due to too great a displacement between
    where the base register points and the per-CPU variable.
    
    On FRV, the .h declaration says that the variable is in the .sdata section, but
    the .c definition says it's actually in the .data section.  The linker throws
    up the following errors:
    
    kernel/built-in.o: In function `release_task':
    kernel/exit.c:78: relocation truncated to fit: R_FRV_GPREL12 against symbol `per_cpu__process_counts' defined in .data section in kernel/built-in.o
    kernel/exit.c:78: relocation truncated to fit: R_FRV_GPREL12 against symbol `per_cpu__process_counts' defined in .data section in kernel/built-in.o
    
    To fix this, DECLARE_PER_CPU() should simply apply the same section attribute
    as does DEFINE_PER_CPU().  However, this is made slightly more complex by
    virtue of the fact that there are several variants on DEFINE, so these need to
    be matched by variants on DECLARE.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Apr 21, 2009
Commits on Apr 21, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix btrfs fallocate oops and deadlock
      Btrfs: use the right node in reada_for_balance
      Btrfs: fix oops on page->mapping->host during writepage
      Btrfs: add a priority queue to the async thread helpers
      Btrfs: use WRITE_SYNC for synchronous writes
    torvalds committed Apr 21, 2009
  2. @torvalds

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare…

    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      go7007: Convert to the new i2c device binding model
    torvalds committed Apr 21, 2009
  3. @RoelKluin @torvalds

    bfin_5xx: misplaced parentheses

    `!' has a higher precedence than `&', parentheses are misplaced.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Acked-by: Sonic Zhang <sonic.zhang@analog.com>
    Cc: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    RoelKluin committed with torvalds Apr 21, 2009
  4. @kosaki @torvalds

    vmscan,memcg: reintroduce sc->may_swap

    Commit a6dc60f ("vmscan: rename
    sc.may_swap to may_unmap") removed the may_swap flag, but memcg had used
    it as a flag for "we need to use swap?", as the name indicate.
    
    And in the current implementation, memcg cannot reclaim mapped file
    caches when mem+swap hits the limit.
    
    re-introduce may_swap flag and handle it at get_scan_ratio().  This
    patch doesn't influence any scan_control users other than memcg.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    kosaki committed with torvalds Apr 21, 2009
  5. @torvalds

    edac: ppc mpc85xx fix mc err detect

    Error found by Jeff Haran.
    
    The error detect register is 0s when no errors are detected.  The check
    code is incorrect, so reverse check sense.
    
    Reported-by: Jeff Haran <jharan@Brocade.COM>
    Signed-off-by: Dave Jiang <djiang@mvista.com>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Dave Jiang committed with torvalds Apr 21, 2009
  6. @eparis @torvalds

    scsi: mpt: suppress debugobjects warning

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13133
    
    ODEBUG: object is on stack, but not annotated
    ------------[ cut here ]------------
    WARNING: at lib/debugobjects.c:253 __debug_object_init+0x1f3/0x276()
    Hardware name: VMware Virtual Platform
    Modules linked in: mptspi(+) mptscsih mptbase scsi_transport_spi ext3 jbd mbcache
    Pid: 540, comm: insmod Not tainted 2.6.28-mm1 #2
    Call Trace:
     [<c042c51c>] warn_slowpath+0x74/0x8a
     [<c0469600>] ? start_critical_timing+0x96/0xb7
     [<c060c8ea>] ? _spin_unlock_irqrestore+0x2f/0x3c
     [<c0446fad>] ? trace_hardirqs_off_caller+0x18/0xaf
     [<c044704f>] ? trace_hardirqs_off+0xb/0xd
     [<c060c8ea>] ? _spin_unlock_irqrestore+0x2f/0x3c
     [<c042cb84>] ? release_console_sem+0x1a5/0x1ad
     [<c05013e6>] __debug_object_init+0x1f3/0x276
     [<c0501494>] debug_object_init+0x13/0x17
     [<c0433c56>] init_timer+0x10/0x1a
     [<e08e5b54>] mpt_config+0x1c1/0x2b7 [mptbase]
     [<e08e3b82>] ? kmalloc+0x8/0xa [mptbase]
     [<e08e3b82>] ? kmalloc+0x8/0xa [mptbase]
     [<e08e6fa2>] mpt_do_ioc_recovery+0x950/0x1212 [mptbase]
     [<c04496c2>] ? __lock_acquire+0xa69/0xacc
     [<c060c8f1>] ? _spin_unlock_irqrestore+0x36/0x3c
     [<c060c3af>] ? _spin_unlock_irq+0x22/0x26
     [<c04f2d8b>] ? string+0x2b/0x76
     [<c04f310e>] ? vsnprintf+0x338/0x7b3
     [<c04496c2>] ? __lock_acquire+0xa69/0xacc
     [<c060c8ea>] ? _spin_unlock_irqrestore+0x2f/0x3c
     [<c04496c2>] ? __lock_acquire+0xa69/0xacc
     [<c044897d>] ? debug_check_no_locks_freed+0xeb/0x105
     [<c060c8f1>] ? _spin_unlock_irqrestore+0x36/0x3c
     [<c04488bc>] ? debug_check_no_locks_freed+0x2a/0x105
     [<c0446b8c>] ? lock_release_holdtime+0x43/0x48
     [<c043f742>] ? up_read+0x16/0x29
     [<c05076f8>] ? pci_get_slot+0x66/0x72
     [<e08e89ca>] mpt_attach+0x881/0x9b1 [mptbase]
     [<e091c8e5>] mptspi_probe+0x11/0x354 [mptspi]
    
    Noticing that every caller of mpt_config has its CONFIGPARMS struct
    declared on the stack and thus the &pCfg->timer is always on the stack I
    changed init_timer() to init_timer_on_stack() and it seems to have shut
    up.....
    
    Cc: "Moore, Eric Dean" <Eric.Moore@lsil.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: "Desai, Kashyap" <Kashyap.Desai@lsi.com>
    Cc: <stable@kernel.org>		[2.6.29.x]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    eparis committed with torvalds Apr 21, 2009
  7. @torvalds

    sgi-xp/sgi-gru: allow modules to load on non-uv systems

    For an upcoming distro release, we need to have the xp kernel module
    loadable even when not on UV equipment.  The xpc module will not load.
    This will allow one set of modules dependent upon xp to work on either UV
    or non-UV equipment.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Jack Steiner <steiner@sgi.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Robin Holt committed with torvalds Apr 21, 2009
  8. @congwang @torvalds

    uml: kill a kconfig warning

    Got this warning from Kconfig:
    
       boolean symbol INPUT tested for 'm'? test forced to 'n'
    
    because INPUT is tristate, not bool.
    
    Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    congwang committed with torvalds Apr 21, 2009
  9. @torvalds

    frv: insert PCI root bus resources for the MB93090 devel motherboard

    Insert PCI root bus resources for the FRV-based MB93090 development kit
    motherboard.  This is required because the CPU's window onto the PCI bus
    address space is considerably smaller than the CPU's full address space
    and non-PCI devices lie outside of the PCI window that we might want to
    access.
    
    Without this patch, the PCI root bus uses the platform-level bus
    resources, and these are then confined to the PCI window, thus making
    platform_device_add() reject devices outside of this window.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Apr 21, 2009
  10. @torvalds

    rtc-cmos: fix printk output

    With no IRQ available/defined, RTC-CMOS driver prints something like:
    	rtc0: alarms up to one no, y3k, 114 bytes nvram
                                  ^^^^
    I guess the following is a bit easier to understand:
    	rtc0: no alarms, y3k, 114 bytes nvram
    
    Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Krzysztof Halasa committed with torvalds Apr 21, 2009
  11. @torvalds

    spi: documentation: emphasise spi_master.setup() semantics

    This is a doc-only patch which I hope will reduce the number of
    spi_master controller driver patches starting out with a common
    implementation bug.
    
    (As in: almost every spi_master driver I see starts out with its
    version of this bug.  Sigh.)
    
    It just re-emphasizes that the setup() method may be called for one
    device while a transfer is active on another ...  which means that most
    driver implementations shouldn't touch any registers.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Brownell committed with torvalds Apr 21, 2009
  12. @rpjday @torvalds

    MAINTAINERS: add a more searchable string for the H8300 architecture.

    Add a parenthesized string of "H8300" for more convenient searchability
    in the MAINTAINERS file.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Cc: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rpjday committed with torvalds Apr 21, 2009
  13. @torvalds

    MAINTAINERS: add Matt Mackall to embedded maintainers

    Impact: make more work for myself
    
    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Matt Mackall committed with torvalds Apr 21, 2009
  14. @RoelKluin @torvalds

    spi: pxa2xx: limit reaches -1

    On line 944 the return value of flush() is considered as a boolean,
    but limit reaches -1 upon timeout which evaluates to true.
    
    On 540, 594, 720 the same occurs for wait_ssp_rx_stall()
    On 536 the same occurs for wait_dma_channel_stop()
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Eric Miao <eric.miao@marvell.com>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    RoelKluin committed with torvalds Apr 21, 2009
  15. @JoePerches @torvalds

    MAINTAINERS: update KMEMTRACE pattern after file rename

    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Acked-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    JoePerches committed with torvalds Apr 21, 2009
  16. @JoePerches @torvalds

    MAINTAINERS: remove include/asm-*/suspend* file patterns

    There are no more arches with suspend support using these directories.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    JoePerches committed with torvalds Apr 21, 2009
  17. @drwyrm @torvalds

    pxa2xx_spi: restore DRCMR on resume

    If DMA is enabled, any spi_sync call after suspend/resume would block
    forever, because DRCMR is lost on suspend.  This patch restores DRCMR to
    the same values set by probe.
    
    Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    drwyrm committed with torvalds Apr 21, 2009
  18. @torvalds

    drivers/input/serio/hp_sdc.c: fix crash when removing hp_sdc module

    On parisc machines, which don't have HIL, removing the hp_sdc module
    panics the kernel.  Fix this by returning early in hp_sdc_exit() if no HP
    SDC controller was found.
    
    Add functionality to probe for the hp_sdc_mlc kernel module (which takes
    care of the upper layer HIL functionality on parisc) after two seconds.
    This is needed to get all the other HIL drivers (keyboard / mouse/ ..)
    drivers automatically loaded by udev later as well.
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Frans Pop <elendil@planet.nl>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Grant Grundler <grundler@parisc-linux.org>
    Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Helge Deller committed with torvalds Apr 21, 2009
  19. @hkamezawa @torvalds

    memcg: use rcu_dereference to access mm->owner

    mm->owner should be accessed with rcu_dereference().
    
    Reported-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    hkamezawa committed with torvalds Apr 21, 2009
  20. @mita @torvalds

    hugetlbfs: return negative error code for bad mount option

    This fixes the following BUG:
    
      # mount -o size=MM -t hugetlbfs none /huge
      hugetlbfs: Bad value 'MM' for mount option 'size=MM'
      ------------[ cut here ]------------
      kernel BUG at fs/super.c:996!
    
    Due to
    
    	BUG_ON(!mnt->mnt_sb);
    
    in vfs_kern_mount().
    
    Also, remove unused #include <linux/quotaops.h>
    
    Cc: William Irwin <wli@holomorphy.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    mita committed with torvalds Apr 21, 2009
  21. @torvalds

    ipmi: add oem message handling

    Enable userspace to receive messages that a BMC transmits using an OEM
    medium.  This is used by the HP iLO2.
    
    Based on code originally written by Patrick Schoeller.
    
    Signed-off-by: dann frazier <dannf@hp.com>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dann frazier committed with torvalds Apr 21, 2009
  22. @torvalds

    ipmi: fix statistics counting issues

    Bela Lubkin noticed that the statistics for send IPMB and LAN commands
    in the IPMI driver could be incremented even if an error occurred.  Move
    the increments to the proper place to avoid this.
    
    Also add some statistics for retransmissions that failed, and some little
    helper functions to neaten up the code a little.
    
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Cc: Bela Lubkin <blubkin@vmware.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Corey Minyard committed with torvalds Apr 21, 2009
  23. @cminyard @torvalds

    ipmi: test for event buffer before using

    The IPMI driver would attempt to use the event buffer even if that
    didn't exist on the BMC.  This patch modified the IPMI driver to check
    for the event buffer's existence before trying to use it.
    
    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    cminyard committed with torvalds Apr 21, 2009
  24. @cminyard @torvalds

    ipmi: fix platform return check

    The wrong return value is being tested when allocating a platform device
    in the IPMI SI code.  Check the right value.
    
    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    cminyard committed with torvalds Apr 21, 2009
  25. @torvalds

    clocksource: add enable() and disable() callbacks

    Add enable() and disable() callbacks for clocksources.
    
    This allows us to put unused clocksources in power save mode.  The
    functions clocksource_enable() and clocksource_disable() wrap the
    callbacks and are inserted in the timekeeping code to enable before use
    and disable after switching to a new clocksource.
    
    Signed-off-by: Magnus Damm <damm@igel.co.jp>
    Acked-by: John Stultz <johnstul@us.ibm.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Magnus Damm committed with torvalds Apr 21, 2009
  26. @torvalds

    clocksource: pass clocksource to read() callback

    Pass clocksource pointer to the read() callback for clocksources.  This
    allows us to share the callback between multiple instances.
    
    [hugh@veritas.com: fix powerpc build of clocksource pass clocksource mods]
    [akpm@linux-foundation.org: cleanup]
    Signed-off-by: Magnus Damm <damm@igel.co.jp>
    Acked-by: John Stultz <johnstul@us.ibm.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Magnus Damm committed with torvalds Apr 21, 2009
  27. @torvalds

    pxafb: lcsr1 is unused without CONFIG_FB_PXA_OVERLAY

    Fixes the warning:
    
      drivers/video/pxafb.c: In function 'pxafb_handle_irq':
      drivers/video/pxafb.c:1442: warning: unused variable 'lcsr1'
    
    [akpm@linux-foundation.org: save an ifdef]
    Signed-off-by: Denis V. Lunev <den@openvz.org>
    Cc: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Denis V. Lunev committed with torvalds Apr 21, 2009
  28. @vperic @torvalds

    asiliantfb: add missing return statement

    Commit 032220b (asiliantfb: fix cmap memory leaks) changed the function
    init_asiliant from void to int, resulting in the following compile warning:
    
      drivers/video/asiliantfb.c: In function `init_asiliant':
      drivers/video/asiliantfb.c:536: warning: control reaches end of non-void function
    
    Fix the warning by returning 0.
    
    Signed-off-by: Vlada Peric <vlada.peric@gmail.com>
    Cc: Andres Salomon <dilinger@debian.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    vperic committed with torvalds Apr 21, 2009
  29. go7007: Convert to the new i2c device binding model

    Move the go7007 driver away from the legacy i2c binding model, which
    is going away really soon now.
    
    The I2C addresses of the audio and video chips in s2250-board didn't
    look quite right, apparently they were left-aligned values when Linux
    wants right-aligned values, so I fixed them too.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Jean Delvare committed Apr 21, 2009
  30. @chrismason-xx

    Btrfs: fix btrfs fallocate oops and deadlock

    Btrfs fallocate was incorrectly starting a transaction with a lock held
    on the extent_io tree for the file, which could deadlock.  Strictly
    speaking it was using join_transaction which would be safe, but it is better
    to move the transaction outside of the lock.
    
    When preallocated extents are overwritten, btrfs_mark_buffer_dirty was
    being called on an unlocked buffer.  This was triggering an assertion and
    oops because the lock is supposed to be held.
    
    The bug was calling btrfs_mark_buffer_dirty on a leaf after btrfs_del_item had
    been run.  btrfs_del_item takes care of dirtying things, so the solution is a
    to skip the btrfs_mark_buffer_dirty call in this case.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx committed Apr 21, 2009