Permalink
Switch branches/tags
Commits on Oct 2, 2009
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Oct 2, 2009
    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix data space leak fix
      Btrfs: remove duplicates of filemap_ helpers
      Btrfs: take i_mutex before generic_write_checks
      Btrfs: fix arguments to btrfs_wait_on_page_writeback_range
      Btrfs: fix deadlock with free space handling and user transactions
      Btrfs: fix error cases for ioctl transactions
      Btrfs: Use CONFIG_BTRFS_POSIX_ACL to enable ACL code
      Btrfs: introduce missing kfree
      Btrfs: Fix setting umask when POSIX ACLs are not enabled
      Btrfs: proper -ENOSPC handling
Commits on Oct 1, 2009
  1. spi-imx: strip down chipselect function to only drive the chipselect

    Uwe Kleine-König committed with torvalds Oct 1, 2009
    spi_imx_chipselect() made things that should be (and mostly are) done by
    spi_imx_setupxfer.  Only setting the tx and rx functions was missing.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. spi-imx: initialize complete config struct

    Uwe Kleine-König committed with torvalds Oct 1, 2009
    Otherwise the config function uses random data from the stack.  This
    didn't stick out because config is called once more in the chipselect
    function with correct parameters.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. spi-imx: no need to assert bits_per_word being initialized

    Uwe Kleine-König committed with torvalds Oct 1, 2009
    spi_imx_setup() is only called by spi_setup().  The latter does the
    initialization already.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. spi-imx: setup mode_bits we can handle

    saschahauer committed with torvalds Oct 1, 2009
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. spi-imx: fix initial chipselect settings

    saschahauer committed with torvalds Oct 1, 2009
    We can only setup the gpio pins in spi_setup time when we know the
    SPI_CS_HIGH setting.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. spi-imx: update state correctly

    saschahauer committed with torvalds Oct 1, 2009
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. spi-imx: rename source file to spi_imx.c

    Uwe Kleine-König committed with torvalds Oct 1, 2009
    This makes the filename match the Kconfig symbol and the driver name.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. afs: remove cache.h

    Christoph Hellwig committed with torvalds Oct 1, 2009
    It's just a wrapper for <linux/fscache.h>, so remove it.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    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>
  9. sscanf(): fix %*s%n

    Andy753421 committed with torvalds Oct 1, 2009
    When using %*s, sscanf should honor conversion specifiers immediately
    following the %*s.  For example, the following code should find the
    position of the end of the string "hello".
    
      int end;
      char buf[] = "hello    world";
      sscanf(buf, "%*s%n", &end);
      printf("%d\n", end);
    
    Ideally, sscanf would advance the fmt and str pointers the same as it
    would without the *, but the code for that is rather complicated and is
    not included in the patch.
    
    Signed-off-by: Andy Spencer <andy753421@gmail.com>
    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. serial: add parameter to force skipping the test for the TXEN bug

    Chuck Ebbert committed with torvalds Oct 1, 2009
    Allow users to force skipping the TXEN test at init time. Applies
    to all serial ports. Intended for debugging only.
    
    There is a blacklist for devices where we need to skip the test but the
    list is not complete.  This lets users force skipping the test so we can
    determine if they need to be added to the list.
    
    Some HP machines with weird serial consoles have this problem and there
    may be more.
    
    Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. serial167: fix read buffer overflow

    RoelKluin committed with torvalds Oct 1, 2009
    Check whether index is within bounds before grabbing the element.
    
    Also, since NR_PORTS is defined ARRAY_SIZE(cy_port), cy_port[NR_PORTS] is
    out of bounds as well.
    
    [akpm@linux-foundation.org: cleanup, remove (long) casts]
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. cyclades: fix read buffer overflow

    RoelKluin committed with torvalds Oct 1, 2009
    irq is declared with size NR_CARDS (4), but the loop containing this
    segment runs up until NR_ISA_ADDRS (16), possibly reading from irq[i] (and
    trying to use the result)
    
    Identified by the Parfait static scanner.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. icom: convert space to tabs

    Breno Leitao committed with torvalds Oct 1, 2009
    Convert spaces to tabs and remove wrong spaces
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Cc: Scott Kilau <Scott.Kilau@digi.com>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. serial_txx9: use container_of() instead of direct cast

    Atsushi Nemoto committed with torvalds Oct 1, 2009
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. s3cmci: add better support for no card detect or write protect available

    Ben Dooks committed with torvalds Oct 1, 2009
    Add better support for omitting either the card detect or the write
    protect GPIOs if the board does not support it.  Add the fields
    no_wprotect and no_detect to the platform data which when set indicate the
    absence of the respective GPIOs.
    
    Note, this also fixes a minor bug where it tries to free IRQ0 if there is
    no detect gpio available.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. s3cmci: make SDIO IRQ hardware IRQ support build-time configurable

    Ben Dooks committed with torvalds Oct 1, 2009
    We have found a couple of boards where the SDIO IRQ hardware support has
    failed to work properly, and thus we should make it configurable whether
    or not to be included in the driver.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. s3cmci: DMA fixes

    Ben Dooks committed with torvalds Oct 1, 2009
    Fixes for the DMA transfer mode of the driver to try and improve the state
    of the code:
    
    - Ensure that dma_complete is set during the end of the command phase
      so that transfers do not stall awaiting the completion
    
    - Update the DMA debugging to provide a bit more useful information
      such as how many DMA descriptors where not processed and print the
      DMA addresses in hexadecimal.
    
    - Fix the DMA channel request code to actually request DMA for the
      S3CMCI block instead of whatever '0' signified.
    
    - Add fallback to PIO if we cannot get the DMA channel, as many of the
      devices with this block only have a limited number of DMA channels.
    
    - Only try and claim and free the DMA channel if we are trying to use it.
    
    This improves the driver DMA code to the point where it can now identify a
    card and read the partition table.  However the DMA can still stall when
    trying to move data between the host and memory.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. s3cmci: Kconfig selection for PIO/DMA/Both

    Ben Dooks committed with torvalds Oct 1, 2009
    Add a selection for the data transfer mode of the s3cmci driver, allowing
    for either a configuration or rumtime selection of the use of the DMA or
    PIO transfer code.
    
    The PIO only mode is 476 bytes smaller than the driver with both methods
    compiled in.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. s3cmci: add SDIO IRQ support

    Ben Dooks committed with torvalds Oct 1, 2009
    The controller supports SDIO IRQ detection so add support for hardware
    assisted SDIO interrupt detection for the SDIO core.  This improves the
    response time for SDIO interrupts and thus the transfer rate from devices
    such as the Marvel 8686.
    
    As a note, it does seem that the controller will miss an IRQ than is held
    asserted, so there are some manual checks to see if the SDIO interrupt is
    active after a transfer.
    
    Major testing on the S3C2440.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. s3cmci: add debugfs support for examining driver and hardware state

    Ben Dooks committed with torvalds Oct 1, 2009
    Export driver state and hardware register state via debugfs entries
    created under a directory formed from dev_name() on the probed device when
    CONFIG_DEBUG_FS is set.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. s3cmci: fix direct write to interrupt mask

    Ben Dooks committed with torvalds Oct 1, 2009
    The clear_imask() call should be used to clear the interrupt mask
    register, as it may end up clearing the SDIO interrupt bit if this is
    enabled.
    
    Change all writes of zero to SDIIMSK register to use clear_imask() ready
    for the SDIO updates.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. s3cmci: change to use dev_pm_ops

    Ben Dooks committed with torvalds Oct 1, 2009
    Move to using dev_pm_ops for suspend and resume.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. s3cmci: change GPIO to gpiolib from S3C24XX specific calls

    Ben Dooks committed with torvalds Oct 1, 2009
    Move to using gpiolib to access the card detect and write protect GPIO
    lines instead of using the platform speicifc s3c2410_gpio calls.
    
    Also ensure that the card lines are claimed the same way to avoid overlap
    with any other drivers.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. s3cmci: update probe to use new platform id list

    Ben Dooks committed with torvalds Oct 1, 2009
    Use the platform id list to match the three different versions of the
    hardware block that this driver supports.
    
    This will change the prefix of the console messages produced by this
    driver to be prefixed by s3c-mci instead of the hardware block name, such
    as s3c2440-mci.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. s3cmci: use resource_size() instead of local macro

    Ben Dooks committed with torvalds Oct 1, 2009
    Replace the local definition RESSIZE() with the standard resource_size()
    call for getting the size of a struct resource.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  26. memcg: reduce check for softlimit excess

    hkamezawa committed with torvalds Oct 1, 2009
    In charge/uncharge/reclaim path, usage_in_excess is calculated repeatedly
    and it takes res_counter's spin_lock every time.
    
    This patch removes unnecessary calls for res_count_soft_limit_excess.
    
    Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. memcg: some modification to softlimit under hierarchical memory reclaim.

    hkamezawa committed with torvalds Oct 1, 2009
    This patch clean up/fixes for memcg's uncharge soft limit path.
    
    Problems:
      Now, res_counter_charge()/uncharge() handles softlimit information at
      charge/uncharge and softlimit-check is done when event counter per memcg
      goes over limit. Now, event counter per memcg is updated only when
      memory usage is over soft limit. Here, considering hierarchical memcg
      management, ancesotors should be taken care of.
    
      Now, ancerstors(hierarchy) are handled in charge() but not in uncharge().
      This is not good.
    
      Prolems:
      1. memcg's event counter incremented only when softlimit hits. That's bad.
         It makes event counter hard to be reused for other purpose.
    
      2. At uncharge, only the lowest level rescounter is handled. This is bug.
         Because ancesotor's event counter is not incremented, children should
         take care of them.
    
      3. res_counter_uncharge()'s 3rd argument is NULL in most case.
         ops under res_counter->lock should be small. No "if" sentense is better.
    
    Fixes:
      * Removed soft_limit_xx poitner and checks in charge and uncharge.
        Do-check-only-when-necessary scheme works enough well without them.
    
      * make event-counter of memcg incremented at every charge/uncharge.
        (per-cpu area will be accessed soon anyway)
    
      * All ancestors are checked at soft-limit-check. This is necessary because
        ancesotor's event counter may never be modified. Then, they should be
        checked at the same time.
    
    Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. cgroup: catch bad css refcnt at css_put

    hkamezawa committed with torvalds Oct 1, 2009
    __css_put() doesn't check a bug as refcnt goes to minus.
    I think it should be caught. This patch adds a check for it.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. memcg: fix refcnt going negative

    hkamezawa committed with torvalds Oct 1, 2009
    __mem_cgroup_largest_soft_limit_node() returns a mem_cgroup_per_zone "mz"
    with incremnted mz->mem->css's refcnt.  Then, the caller of this function
    has to call css_put(mz->mem->css).
    
    But, mz can be !NULL even if "not found" i.e.  without css_get().  By
    this, css->refcnt will go down to minus.
    
    This may cause various things...one of results will be
    initite-loop in css_tryget()  as this.
    
    INFO: RCU detected CPU 0 stall (t=10000 jiffies)
    sending NMI to all CPUs:
    NMI backtrace for cpu 0
    CPU 0:
    <snip>
    
     <<EOE>>  <IRQ>  [<ffffffff810884bd>] trace_hardirqs_off+0xd/0x10
      [<ffffffff8102a940>] flat_send_IPI_mask+0x90/0xb0
      [<ffffffff8102a9c9>] flat_send_IPI_all+0x69/0x70
      [<ffffffff81027372>] arch_trigger_all_cpu_backtrace+0x62/0xa0
      [<ffffffff810bff8e>] __rcu_pending+0x7e/0x370
      [<ffffffff810c02c7>] rcu_check_callbacks+0x47/0x130
      [<ffffffff81063a26>] update_process_times+0x46/0x70
      [<ffffffff81085930>] tick_sched_timer+0x60/0x160
      [<ffffffff810858d0>] ? tick_sched_timer+0x0/0x160
      [<ffffffff8107a03a>] __run_hrtimer+0xba/0x150
      [<ffffffff8107a325>] hrtimer_interrupt+0xd5/0x1b0
      [<ffffffff81426dfe>] ? trace_hardirqs_off_thunk+0x3a/0x3c
      [<ffffffff8142cacd>] smp_apic_timer_interrupt+0x6d/0x9b
      [<ffffffff8100cb33>] apic_timer_interrupt+0x13/0x20
      <EOI>  [<ffffffff811317b6>] ? mem_cgroup_walk_tree+0x156/0x180
      [<ffffffff811316d3>] ? mem_cgroup_walk_tree+0x73/0x180
      [<ffffffff81131692>] ? mem_cgroup_walk_tree+0x32/0x180
      [<ffffffff81131a00>] ? mem_cgroup_get_local_stat+0x0/0x110
      [<ffffffff81131d5b>] ? mem_control_stat_show+0x14b/0x330
      [<ffffffff810a57fd>] ? cgroup_seqfile_show+0x3d/0x60
    
    Above shows CPU0 caught in css_tryget()'s inifinite loop because
    of bad refcnt.
    
    This is a fix to set mz=NULL at the top of retry path.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Paul Menage <menage@google.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. uartlite: allow building for timberdale MFD

    Richard Röjfors committed with torvalds Oct 1, 2009
    Some configurations of the Timberdale FPGA has the uartlite
    included.
    
    Signed-off-by: Richard Röjfors <richard.rojfors@mocean-labs.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  31. docs: update patch size in SubmittingPatches

    Randy Dunlap committed with torvalds Oct 1, 2009
    This patch size comment is like so last millenium.  Update it to modern
    times.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. sdio: pass whitelisted cis funce tuples to sdio drivers

    Albert Herranz committed with torvalds Oct 1, 2009
    Some manufacturers provide vendor information in non-vendor specific CIS
    tuples.  For example, Broadcom uses an Extended Function tuple to provide
    the MAC address on some of their network cards, as in the case of the
    Nintendo Wii WLAN daughter card.
    
    This patch allows passing whitelisted FUNCE tuples unknown to the SDIO
    core to a matching SDIO driver instead of rejecting them and failing.
    
    Signed-off-by: Albert Herranz <albert_herranz@yahoo.es>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  33. mm/rmap.c: fix comment

    zyzii committed with torvalds Oct 1, 2009
    The page_address_in_vma() is not only used in unuse_vma().
    
    Signed-off-by: Huang Shijie <shijie8@gmail.com>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  34. x86: fix csum_ipv6_magic asm memory clobber

    sthibaul committed with torvalds Oct 1, 2009
    Just like ip_fast_csum, the assembly snippet in csum_ipv6_magic needs a
    memory clobber, as it is only passed the address of the buffer, not a
    memory reference to the buffer itself.
    
    This caused failures in Hurd's pfinetv4 when we tried to compile it with
    gcc-4.3 (bogus checksums).
    
    Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Acked-by: "David S. Miller" <davem@davemloft.net>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>