Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.31-git12
Commits on Sep 22, 2009
  1. @torvalds

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

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf_event, powerpc: Fix compilation after big perf_counter rename
  2. @torvalds

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

    torvalds authored
    …/git/vegard/kmemcheck
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck:
      kmemcheck: add missing braces to do-while in kmemcheck_annotate_bitfield
      kmemcheck: update documentation
      kmemcheck: depend on HAVE_ARCH_KMEMCHECK
      kmemcheck: remove useless check
      kmemcheck: remove duplicated #include
  3. @torvalds

    Merge branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux

    torvalds authored
    * 'for-2.6.32' of git://linux-nfs.org/~bfields/linux: (68 commits)
      nfsd4: nfsv4 clients should cross mountpoints
      nfsd: revise 4.1 status documentation
      sunrpc/cache: avoid variable over-loading in cache_defer_req
      sunrpc/cache: use list_del_init for the list_head entries in cache_deferred_req
      nfsd: return success for non-NFS4 nfs4_state_start
      nfsd41: Refactor create_client()
      nfsd41: modify nfsd4.1 backchannel to use new xprt class
      nfsd41: Backchannel: Implement cb_recall over NFSv4.1
      nfsd41: Backchannel: cb_sequence callback
      nfsd41: Backchannel: Setup sequence information
      nfsd41: Backchannel: Server backchannel RPC wait queue
      nfsd41: Backchannel: Add sequence arguments to callback RPC arguments
      nfsd41: Backchannel: callback infrastructure
      nfsd4: use common rpc_cred for all callbacks
      nfsd4: allow nfs4 state startup to fail
      SUNRPC: Defer the auth_gss upcall when the RPC call is asynchronous
      nfsd4: fix null dereference creating nfsv4 callback client
      nfsd4: fix whitespace in NFSPROC4_CLNT_CB_NULL definition
      nfsd41: sunrpc: add new xprt class for nfsv4.1 backchannel
      sunrpc/cache: simplify cache_fresh_locked and cache_fresh_unlocked.
      ...
  4. @torvalds

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

    torvalds authored
    …/git/jikos/trivial
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
      trivial: fix typo in aic7xxx comment
      trivial: fix comment typo in drivers/ata/pata_hpt37x.c
      trivial: typo in kernel-parameters.txt
      trivial: fix typo in tracing documentation
      trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
      trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
      trivial: remove unnecessary semicolons
      trivial: Fix duplicated word "options" in comment
      trivial: kbuild: remove extraneous blank line after declaration of usage()
      trivial: improve help text for mm debug config options
      trivial: doc: hpfall: accept disk device to unload as argument
      trivial: doc: hpfall: reduce risk that hpfall can do harm
      trivial: SubmittingPatches: Fix reference to renumbered step
      trivial: fix typos "man[ae]g?ment" -> "management"
      trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
      trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
      trivial: fix missing printk space in amd_k7_smp_check
      trivial: fix typo s/ketymap/keymap/ in comment
      trivial: fix typo "to to" in multiple files
      trivial: fix typos in comments s/DGBU/DBGU/
      ...
  5. @torvalds

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

    torvalds authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Remove duplicate Kconfig entry
      HID: consolidate connect and disconnect into core code
      HID: fix non-atomic allocation in hid_input_report
  6. @Alphix @torvalds

    input: add a driver for the Winbond WPCD376I Consumer IR hardware

    Alphix authored torvalds committed
    Add a driver for the the Consumer IR (CIR) functionality of the Winbond
    WPCD376I chipset (found on e.g. Intel DG45FC motherboards).
    
    Signed-off-by: David Härdeman <david@hardeman.nu>
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @Alphix @torvalds

    pnp: add a shutdown method to pnp drivers

    Alphix authored torvalds committed
    The shutdown method is used by the winbond cir driver to setup the
    hardware for wake-from-S5.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: David Härdeman <david@hardeman.nu>
    Cc: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @rydberg @torvalds

    hwmon: applesmc: restore accelerometer and keyboard backlight on resume

    rydberg authored torvalds committed
    On resume from suspend, the driver currently resets the logical state as
    if it was brought up from halt.  This patch uses the
    dev_pm_ops.resume/restore methods to synchronize the hardware with the
    memorized logical state, in effect bringing back the accelerometer and
    backlight to the state prior to suspend.  Works for both suspend to ram
    and hibernation.  The patch has zero effect on the running state.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Cc: Nicolas Boichat <nicolas@boichat.ch>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @RoelKluin @torvalds

    hwmon: fix freeing of gpio_data and irq

    RoelKluin authored torvalds committed
    If already requested, gpio_data and irq should be freed in the case of an
    error.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    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>
  10. @Araneidae @torvalds

    drivers/hwmon/adm1021.c: add low_power support for adm1021 driver

    Araneidae authored torvalds committed
    Occasionally it is helpful to be able to turn a temperature sensor off
    (for example if it's making unwanted electrical noise).  This patch
    adds a sysfs node to put any adm1021 compatible device into low power mode.
    
    Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
    Cc: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @Araneidae @torvalds

    drivers/hwmon/adm1021.c: support high precision ADM1023 remote sensor

    Araneidae authored torvalds committed
    The ADM1023 temperature sensor supports higher resolution for its external
    sensor (sensitivity of 1/8 deg C).  This patch makes this higher
    resolution available through the appropriate temperature sysfs nodes.
    
    Curiously, this functionality was available in the 2.4 kernel driver (but
    formatted in a less helpful manner).
    
    Cc: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @zonque @torvalds

    lis3_spi: code cleanups

    zonque authored torvalds committed
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @zonque @torvalds

    lis3: add power management functions

    zonque authored torvalds committed
    This enabled power management functions for the SPI transport layer of the
    lis3 devices.  The device's suspend mode is only entered in case no wakeup
    threshold has been given.  In this case, the device is supposed to wake up
    the system and must thus not be put to deep sleep.
    
    [randy.dunlap@oracle.com: fix lis3-spi for CONFIG_PM=n]
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Eric Piel <eric.piel@tremplin-utc.net>
    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>
  14. @zonque @torvalds

    lis3: add free-fall/wakeup function via platform_data

    zonque authored torvalds committed
    This offers a way for platforms to define flags and thresholds for the
    free-fall/wakeup functions of the lis302d chips.
    
    More registers needed to be seperated as they are specific to the
    
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @zonque @torvalds

    lis3: fix typo

    zonque authored torvalds committed
    Bit 0x80 in CTRL_REG3 is an ACTIVE_LOW rather than an ACTIVE_HIGH
    function, I got that wrong during my last change.
    
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    drivers/hwmon/coretemp.c: enable the Intel Atom

    Michael Riepe authored torvalds committed
    Enable the coretemp driver on an Intel Atom.
    
    I'm not sure if the readings are correct, however - on my 330, the driver
    reports values between 27 and 41 °C (with core1 being about 8°C hotter
    than core0, given the same load).  Maybe the maximum temperature of 100 °C
    is wrong for Atom CPUs.
    
    Cc: Arjan van de Ven <arjan@infradead.org>
    Cc: Rudolf Marek <r.marek@assembler.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @vapier @torvalds

    checkpatch: add some common Blackfin checks

    vapier authored torvalds committed
    Add checks for Blackfin-specific issues that seem to crop up from time to
    time.  In particular, we have helper macros to break a 32bit address into
    the hi/lo parts, and we want to make sure people use the csync/ssync
    variant that includes fun anomaly workarounds.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @torvalds

    checkpatch: version 0.29

    Andy Whitcroft authored torvalds committed
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. @torvalds

    checkpatch: limit sN/uN matches to actual bit sizes

    Andy Whitcroft authored torvalds committed
    Limit our type matcher to the s/u/le/be etc sizes that actually exist to
    prevent miss categorising s2 as a type.  Fix up the spelling of the error
    also.
    
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @torvalds

    checkpatch: format strings should not have brackets in macros

    Andy Whitcroft authored torvalds committed
    We should not recommend braces for the following:
    
        #define pr_fmt(fmt)    "%s: " fmt, __func__
    
    allow things with double quotes round them to avoid this check.
    
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @hanneseder-net @torvalds

    checkpatch: make -f alias --file, add --help, more verbose help message

    hanneseder-net authored torvalds committed
    Impact:
      - More verbose help/usage message.
      - Make the option -f an alias for --file.
      - On -h, --help, and --version display help message and exit(0).
      - With no FILE(s) given, exit(1) with "no input files".
      - On invalid options display help/usage and exit(1).
    
    Based on a patch by Pavel Machek.
    
    Signed-off-by: Hannes Eder <hannes@hanneseder.net>
    Acked-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @torvalds

    checkpatch: indent checks -- stop when we run out of continuation lines

    Andy Whitcroft authored torvalds committed
    Ensure we terminate when there are no futher continuation lines when
    trying to determine relative indent of conditionals and their blocks.
    
    Reported-by: John Daiker <daikerjohn@gmail.com>
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. @daniel-walker @torvalds

    checkpatch: handle C99 comments correctly (performance issue)

    daniel-walker authored torvalds committed
    This fixes the sanitation process in checkpatch.pl so that it blocks out
    the text after a C99 style comment the same way it does with block style
    comments.  This prevents the text from getting processed as regular code.
    
    Signed-off-by: Daniel Walker <dwalker@fifo99.com>
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. @torvalds

    checkpatch: possible types -- else cannot start a type

    Andy Whitcroft authored torvalds committed
    An else cannot start a type, it would have to be within a block after the
    else.  This can trigger false modifier matching.
    
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. @torvalds

    flex_array: add missing kerneldoc annotations

    David Rientjes authored torvalds committed
    Add kerneldoc annotations for function formals of type struct flex_array
    and gfp_t which are currently lacking.
    
    Signed-off-by: David Rientjes <rientjes@google.com>
    Cc: Dave Hansen <dave@linux.vnet.ibm.com>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  26. @torvalds

    flex_array: introduce DEFINE_FLEX_ARRAY

    David Rientjes authored torvalds committed
    FLEX_ARRAY_INIT(element_size, total_nr_elements) cannot determine if
    either parameter is valid, so flex arrays which are statically allocated
    with this interface can easily become corrupted or reference beyond its
    allocated memory.
    
    This removes FLEX_ARRAY_INIT() as a struct flex_array initializer since no
    initializer may perform the required checking.  Instead, the array is now
    defined with a new interface:
    
    	DEFINE_FLEX_ARRAY(name, element_size, total_nr_elements)
    
    This may be prefixed with `static' for file scope.
    
    This interface includes compile-time checking of the parameters to ensure
    they are valid.  Since the validity of both element_size and
    total_nr_elements depend on FLEX_ARRAY_BASE_SIZE and FLEX_ARRAY_PART_SIZE,
    the kernel build will fail if either of these predefined values changes
    such that the array parameters are no longer valid.
    
    Since BUILD_BUG_ON() requires compile time constants, several of the
    static inline functions that were once local to lib/flex_array.c had to be
    moved to include/linux/flex_array.h.
    
    Signed-off-by: David Rientjes <rientjes@google.com>
    Acked-by: Dave Hansen <dave@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. @torvalds

    flex_array: add flex_array_shrink function

    David Rientjes authored torvalds committed
    Add a new function to the flex_array API:
    
    	int flex_array_shrink(struct flex_array *fa)
    
    This function will free all unused second-level pages.  Since elements are
    now poisoned if they are not allocated with __GFP_ZERO, it's possible to
    identify parts that consist solely of unused elements.
    
    flex_array_shrink() returns the number of pages freed.
    
    Signed-off-by: David Rientjes <rientjes@google.com>
    Cc: Dave Hansen <dave@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. @torvalds

    flex_array: poison free elements

    David Rientjes authored torvalds committed
    Newly initialized flex_array's and/or flex_array_part's are now poisoned
    with a new poison value, FLEX_ARRAY_FREE.  It's value is similar to
    POISON_FREE used in the various slab allocators, but is different to
    distinguish between flex array's poisoned kmem and slab allocator poisoned
    kmem.
    
    This will allow us to identify flex_array_part's that only contain free
    elements (and free them with an addition to the flex_array API).  This
    could also be extended in the future to identify `get' uses on elements
    that have not been `put'.
    
    If __GFP_ZERO is passed for a part's gfp mask, the poisoning is avoided.
    These elements are considered to be in-use since they have been
    initialized.
    
    Signed-off-by: David Rientjes <rientjes@google.com>
    Cc: Dave Hansen <dave@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. @torvalds

    flex_array: add flex_array_clear function

    David Rientjes authored torvalds committed
    Add a new function to the flex_array API:
    
    	int flex_array_clear(struct flex_array *fa,
    				unsigned int element_nr)
    
    This function will zero the element at element_nr in the flex_array.
    
    Although this is equivalent to using flex_array_put() and passing a
    pointer to zero'd memory, flex_array_clear() does not require such a
    pointer to memory that would most likely need to be allocated on the
    caller's stack which could be significantly large depending on
    element_size.
    
    Signed-off-by: David Rientjes <rientjes@google.com>
    Cc: Dave Hansen <dave@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. @mslusarz @torvalds

    vsprintf: use WARN_ON_ONCE

    mslusarz authored torvalds committed
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  31. @JoePerches @torvalds

    MAINTAINERS: move ARM lists to infradead

    JoePerches authored torvalds committed
    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Cc: Krzysztof Halasa <khc@pm.waw.pl>
    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>
  32. @JoePerches @torvalds

    MAINTAINERS: integrate P:/M: lines

    JoePerches authored torvalds committed
    A couple of new uses of separate "P: name" "M: address" lines are
    converted to single line "M: name <address>"
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
    Cc: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  33. @felipec @torvalds

    MAINTAINERS: omap: fix regex

    felipec authored torvalds committed
    Otherwise 'arch/arm/*omap*/foo.c' wouldn't match
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Cc: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  34. @felipec @torvalds

    MAINTAINERS: acpi: add 'include/acpi'

    felipec authored torvalds committed
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Cc: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  35. @JoePerches @torvalds

    scripts/get_maintainer.pl: add maintainers in order listed in matched…

    JoePerches authored torvalds committed
    … section
    
    Previous behavior was "bottom-up" in each section from the pattern "F:"
    entry that matched.  Now information is entered into the various lists in
    the "as entered" order for each matched section.
    
    This also allows the F: entry to be put anywhere in a section, not just as
    the last entries in the section.
    
    And a couple of improvements:
    
    Don't alphabetically sort before outputting the matched scm, status,
    subsystem and web sections.
    
    Ignore content after a single email address so these entries are acceptable
    M:	name <address> whatever other comment
    
    And a fix:
    
    Make an M: entry without a name again use the name from an immediately
    preceding P: line if it exists.
    
    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>
Something went wrong with that request. Please try again.