Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 11, 2008
  1. Linux 2.6.25-rc9

    authored
  2. Merge branch 'docs' of git://git.lwn.net/linux-2.6

    authored
    * 'docs' of git://git.lwn.net/linux-2.6:
      Add additional examples in Documentation/spinlocks.txt
      Move sched-rt-group.txt to scheduler/
      Documentation: move rpc-cache.txt to filesystems/
      Documentation: move nfsroot.txt to filesystems/
      Spell out behavior of atomic_dec_and_lock() in kerneldoc
      Fix a typo in highres.txt
      Fixes to the seq_file document
      Fill out information on patch tags in SubmittingPatches
      Add the seq_file documentation
  3. Add additional examples in Documentation/spinlocks.txt

    Mark Fasheh authored Jonathan Corbet committed
    Checkpatch will throw an error if code doesn't use the correct initializers
    for static spinlocks:
    
    ERROR: Use of SPIN_LOCK_UNLOCKED is deprecated: see Documentation/spinlocks.txt
    
    This is fine, but Documentation/spinlocks.txt isn't very clear on how to
    _use_ the new initializers for static variables. To save people time in the
    future, I added two small examples of how to fix old-style static
    initializers to be more lockdep friendly.
    
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  4. Move sched-rt-group.txt to scheduler/

    J. Bruce Fields authored Jonathan Corbet committed
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  5. Documentation: move rpc-cache.txt to filesystems/

    J. Bruce Fields authored Jonathan Corbet committed
    This file is nfs-related.  (Maybe Documentation/filesystems/ would
    benefit from a separate nfs/ directory at some point.)
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  6. Documentation: move nfsroot.txt to filesystems/

    J. Bruce Fields authored Jonathan Corbet committed
    Documentation/ is a little large, and filesystems/ seems an obvious
    place for this file.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  7. Spell out behavior of atomic_dec_and_lock() in kerneldoc

    J. Bruce Fields authored Jonathan Corbet committed
    A little more detail here wouldn't hurt.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  8. Fix "$(AS) -traditional" compile breakage caused by asmlinkage_protect

    Heiko Carstens authored committed
    git commit 54a0151 ("asmlinkage_protect
    replaces prevent_tail_call") causes this build failure on s390:
    
        AS      arch/s390/kernel/entry64.o
      In file included from arch/s390/kernel/entry64.S:14:
      include/linux/linkage.h:34: error: syntax error in macro parameter list
      make[1]: *** [arch/s390/kernel/entry64.o] Error 1
      make: *** [arch/s390/kernel] Error 2
    
    and some other architectures.  The reason is that some architectures add
    the "-traditional" flag to the invocation of $(AS), which disables
    variadic macro argument support.
    
    So just surround the new define with an #ifndef __ASSEMBLY__ to prevent
    any side effects on asm code.
    
    Cc: Roland McGrath <roland@redhat.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare…

    authored
    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c-tiny-usb: New VID/PID pair
      i2c-davinci: Fix lost interrupt
      i2c-ibm_iic: Fast mode parm desc fixup
  10. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      [NETNS][IPV6] tcp - assign the netns for timewait sockets
      [IPV4]: Fix byte value boundary check in do_ip_getsockopt().
      BNX2X: Correct bringing chip out of reset
      [NETFILTER]: nf_nat: autoload IPv4 connection tracking
      [NETFILTER]: xt_hashlimit: fix mask calculation
      [XFRM]: xfrm_user: fix selector family initialization
      rt61pci: rt61pci_beacon_update do not free skb twice
      ssb-mipscore: Fix interrupt vectors
      ssb-pcicore: Fix IRQ TPS flag handling
      mac80211: use short_preamble mode from capability if ERP IE not present
      [NET]: Undo code bloat in hot paths due to print_mac().
      [TCP]: Don't allow FRTO to take place while MTU is being probed
      [TCP]: tcp_simple_retransmit can cause S+L
      [TCP]: Fix NewReno's fast rexmit/recovery problems with GSOed skb
      [TCP]: Restore 2.6.24 mark_head_lost behavior for newreno/fack
      nl80211: fix STA AID bug
      b43legacy: fix bcm4303 crash
      iwlwifi: fix n-band association problem
      ipw2200: set MAC address on radiotap interface
      libertas: fix mode initialization problem
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC]: Fix several regset and ptrace bugs.
  12. @davidel

    signalfd: fix for incorrect SI_QUEUE user data reporting

    davidel authored committed
    Michael Kerrisk found out that signalfd was not reporting back user data
    pushed using sigqueue:
    
      http://groups.google.com/group/linux.kernel/msg/9397cab8551e3123
    
    The following patch makes signalfd report back the ssi_ptr and ssi_int members
    of the signalfd_siginfo structure.
    
    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
    Acked-by: Michael Kerrisk <mtk.manpages@googlemail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. pnp: increase number of devices supported per protocol

    Bjorn Helgaas authored committed
    Increase the PNP "number of devices" limit.  We currently use an unsigned
    char, which limits us to 256 devices per protocol.  This patch changes that to
    an unsigned int.
    
    Not all backends can take advantage of this: we limit ISAPNP to 10 devices in
    isapnp_cfg_begin(), and PNPBIOS is limited to 256 devices because the BIOS
    interfaces use a one-byte device node number.
    
    But there is no limit on the number of PNPACPI devices we may have.  Large HP
    Integrity machines have more than 256, which causes the current "unsigned char
    number" to wrap around.  This causes errors like this:
    
        pnp: PnP ACPI init
        kobject_add failed for 00:00 with -EEXIST, don't try to register things with the same name in the same directory.
    
        Call Trace:
         [<a000000100010720>] show_stack+0x40/0xa0
         [<a0000001000107b0>] dump_stack+0x30/0x60
         [<a0000001001dbdf0>] kobject_add+0x290/0x2c0
         [<a0000001002bfd40>] device_add+0x160/0x860
         [<a0000001002c0470>] device_register+0x30/0x60
         [<a00000010026ba70>] __pnp_add_device+0x130/0x180
         [<a00000010026bb70>] pnp_add_device+0xb0/0xe0
         [<a0000001007f2730>] pnpacpi_add_device+0x510/0x5a0
         [<a0000001007f2810>] pnpacpi_add_device_handler+0x50/0x80
    
    This patch increases the limit to fix this PNPACPI problem.  It should not
    have any adverse effect on ISAPNP or PNPBIOS because their limits are still
    enforced in the backends.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @djbw

    md: close a livelock window in handle_parity_checks5

    djbw authored committed
    If a failure is detected after a parity check operation has been initiated,
    but before it completes handle_parity_checks5 will never quiesce operations on
    the stripe.
    
    Explicitly handle this case by "canceling" the parity check, i.e.  clear the
    STRIPE_OP_CHECK flags and queue the stripe on the handle list again to refresh
    any non-uptodate blocks.
    
    Kernel versions >= 2.6.23 are susceptible.
    
    Cc: <stable@kernel.org>
    Cc: NeilBrown <neilb@suse.de>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @mpagano

    cciss: error: implicit declaration of function 'sg_init_table'

    mpagano authored committed
    This patch adds the missing include directive <linux/scatterlist.h> to the
    cciss.c source file.    This was discovered by our release team when building
    the kernel for the Alpha architecture.
    
    Errors were found as references to functions 'sg_init_table' and 'sg_page' do
    not exist without the include for Alpha.
    
    Signed-off-by: Mike Pagano <mpagano@gentoo.org>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: <mike.miller@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @kaysievers

    rtc: fix platform driver hotplug/coldplug

    kaysievers authored committed
    Since 43cc71e, the platform modalias is
    prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable RTC
    platform drivers, to re-enable module auto loading.
    
    [dbrownell@users.sourceforge.net: more drivers, minor fix]
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @kaysievers

    watchdog: fix platform driver hotplug/coldplug

    kaysievers authored committed
    Since 43cc71e, the platform modalias is
    prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable watchdog
    drivers, to re-enable auto loading.
    
    [dbrownell@users.sourceforge.net: more drivers; registration fixes]
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @kaysievers

    usb host: fix platform driver hotplug/coldplug

    kaysievers authored committed
    Since 43cc71e, the platform modalias is
    prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable USB HCDs,
    to allow re-enable auto loading.
    
    [dbrownell@users.sourceforge.net: more drivers; registration fixes]
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. @kaysievers

    usb gadget: fix platform driver hotplug/coldplug

    kaysievers authored committed
    Since 43cc71e, the platform modalias is
    prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable usb
    peripheral drivers, to re-eable module auto loading.
    
    [dbrownell@users.sourceforge.net: registration fixes]
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @kaysievers

    spi: fix platform driver hotplug/coldplug

    kaysievers authored committed
    Since 43cc71e, the platform modalias is
    prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable SPI
    platform drivers, to allow module auto loading.
    
    [dbrownell@users.sourceforge.net: more drivers: registration fixes]
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    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>
  21. @davidel

    eventfd/kaio integration fix

    davidel authored committed
    Jeff Roberson discovered a race when using kaio eventfd based notifications.
    When it occurs it can lead tomissed wakeups and hung userspace.
    
    This patch fixes the race by moving the notification inside the spinlocked
    section of kaio.  The operation is safe since eventfd spinlock and kaio one
    are unrelated.
    
    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
    Cc: Zach Brown <zach.brown@oracle.com>
    Cc: Jeff Roberson <jroberson@chesapeake.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. rtc: rtc-s35390a.c needs the bitreverse library

    Randy Dunlap authored committed
    rtc-s35390a uses BITREVERSE functions so it needs to select that config symbol
    to ensure that the functions are built.
    
      drivers/built-in.o: In function `s35390a_set_datetime':
      linux-2.6.25-rc8-git7/drivers/rtc/rtc-s35390a.c:144: undefined reference to `byte_rev_table'
      drivers/built-in.o: In function `s35390a_get_datetime':
      linux-2.6.25-rc8-git7/drivers/rtc/rtc-s35390a.c:163: undefined reference to `byte_rev_table'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. cgroups: include hierarchy ids in /proc/<pid>/cgroup

    Paul Menage authored committed
    Extend the /proc/<pid>/cgroup file to include the appropriate hierarchy ID on
    each line.
    
    Currently this ID isn't really needed since a hierarchy can be completely
    identified by the set of subsystems bound to it, but this is likely to change
    in the near future in order to support stateless subsystems and
    merging/rebinding of subsystems.  Getting this change into 2.6.25 reduces the
    need for an API change later.
    
    Signed-off-by: Paul Menage <menage@google.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    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>
  24. @harbaum

    i2c-tiny-usb: New VID/PID pair

    harbaum authored Jean Delvare committed
    I have recently bought some USB PIDs from EZPrototypes for my USB projects
    and one will be for the i2c-tiny-usb. I have not yet started to use the new 
    one in the official i2c-tiny-usb firmware since i think it makes sense to get 
    the change into the kernel before releasing a modified firmware.
    
    This patch adds support for the EZPrototypes USB vid/pid pair used in later
    i2c-tiny-usb firmware versions (avrusb v1.06 and up, usbtiny v2.06 and up).
    
    Signed-off-by: Till Harbaum <Till@Harbaum.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  25. @tkisky

    i2c-davinci: Fix lost interrupt

    tkisky authored Jean Delvare committed
    DAVINCI_I2C_STR_REG is a write 1 to clear register,
    so don't use a read/modify/write cycle.
    
    Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
    Acked-by: Dirk Behme <dirk.behme@gmail.com>
    Signed-off-by: Kevin Hilman <khilman@mvista.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  26. @pmundt

    i2c-ibm_iic: Fast mode parm desc fixup

    pmundt authored Jean Delvare committed
    Noticed this when grepping for fast mode module params, the i2c-ibm_iic
    driver was using a non-existent variable for MODULE_PARM_DESC. Fix it up
    to reflect what it's actually supposed to be describing.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  27. @davem330

    [NETNS][IPV6] tcp - assign the netns for timewait sockets

    Daniel Lezcano authored davem330 committed
    Copy the network namespace from the socket to the timewait socket.
    
    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
    Acked-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  28. Add commentary about the new "asmlinkage_protect()" macro

    authored
    It's really a pretty ugly thing to need, and some day it will hopefully
    be obviated by teaching gcc about the magic calling conventions for the
    low-level system call code, but in the meantime we can at least add big
    honking comments about why we need these insane and strange macros.
    
    I took my comments from my version of the macro, but I ended up deciding
    to just pick Roland's version of the actual code instead (with his
    prettier syntax that uses vararg macros).  Thus the previous two commits
    that actually implement it.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. asmlinkage_protect sys_io_getevents

    Roland McGrath authored committed
    Use asmlinkage_protect in sys_io_getevents, because GCC for i386 with
    CONFIG_FRAME_POINTER=n can decide to clobber an argument word on the
    stack, i.e. the user struct pt_regs.  Here the problem is not a tail
    call, but just the compiler's use of the stack when it inlines and
    optimizes the body of the called function.  This seems to avoid it.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. asmlinkage_protect replaces prevent_tail_call

    Roland McGrath authored committed
    The prevent_tail_call() macro works around the problem of the compiler
    clobbering argument words on the stack, which for asmlinkage functions
    is the caller's (user's) struct pt_regs.  The tail/sibling-call
    optimization is not the only way that the compiler can decide to use
    stack argument words as scratch space, which we have to prevent.
    Other optimizations can do it too.
    
    Until we have new compiler support to make "asmlinkage" binding on the
    compiler's own use of the stack argument frame, we have work around all
    the manifestations of this issue that crop up.
    
    More cases seem to be prevented by also keeping the incoming argument
    variables live at the end of the function.  This makes their original
    stack slots attractive places to leave those variables, so the compiler
    tends not clobber them for something else.  It's still no guarantee, but
    it handles some observed cases that prevent_tail_call() did not.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 10, 2008
  1. x86: Simplify cpu_idle_wait

    Venki Pallipadi authored committed
    This patch also resolves hangs on boot:
    	http://lkml.org/lkml/2008/2/23/263
    	http://bugzilla.kernel.org/show_bug.cgi?id=10093
    
    The bug was causing once-in-few-reboots 10-15 sec wait during boot on
    certain laptops.
    
    Earlier commit 40d6a14 added
    smp_call_function in cpu_idle_wait() to kick cpus that are in tickless
    idle.  Looking at cpu_idle_wait code at that time, code seemed to be
    over-engineered for a case which is rarely used (while changing idle
    handler).
    
    Below is a simplified version of cpu_idle_wait, which just makes a dummy
    smp_call_function to all cpus, to make them come out of old idle handler
    and start using the new idle handler.  It eliminates code in the idle
    loop to handle cpu_idle_wait.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @hharrison

    lzo: fix typo in decompressor

    hharrison authored committed
    Shift of a LE value seems strange, probably meant to shift the cpu-order
    variable as in the prvious section of the switch statement.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Acked-by: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. FRV: Don't make smp_{r, w, }mb() interpolate MEMBAR when CONFIG_SMP=n…

    David Howells authored committed
    … [try #2]
    
    Don't make smp_{r,w,}mb() interpolate a MEMBAR instruction when CONFIG_SMP=n as
    SMP memory barries on UP systems should interpolate a compiler barrier only.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. FRV: Make NOMMU-mode work with base addresses other than 0xC0000000 […

    David Howells authored committed
    …try #2]
    
    Make NOMMU-mode work with base addresses other than 0xC0000000 by:
    
     (1) Giving the code that sets up the protection registers the right address
         in __sdram_base.  Rather than being hard coded to 0xC0000000, the value
         of __page_offset is obtained from the linker script.
    
     (2) Eliminate the check in __switch_to() that verifies the current thread
         info is in the 0xCxxxxxxx region.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. FRV: Add support for emulation of userspace atomic ops [try #2]

    David Howells authored committed
    Use traps 120-126 to emulate atomic cmpxchg32, xchg32, and XOR-, OR-, AND-, SUB-
    and ADD-to-memory operations for userspace.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.