Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 26, 2008
  1. @torvalds

    Linux 2.6.26-rc4

    torvalds authored
  2. @torvalds

    posix timers: discard SI_TIMER signals on exec

    Oleg Nesterov authored torvalds committed
    Based on Roland's patch. This approach was suggested by Austin Clements
    from the very beginning, and then by Linus.
    
    As Austin pointed out, the execing task can be killed by SI_TIMER signal
    because exec flushes the signal handlers, but doesn't discard the pending
    signals generated by posix timers. Perhaps not a bug, but people find this
    surprising. See http://bugzilla.kernel.org/show_bug.cgi?id=10460
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Austin Clements <amdragon+kernelbugzilla@mit.edu>
    Cc: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    posix timers: sigqueue_free: don't free sigqueue if it is queued

    Oleg Nesterov authored torvalds committed
    Currently sigqueue_free() removes sigqueue from list, but doesn't cancel the
    pending signal. This is not consistent, the task should either receive the
    "full" signal along with siginfo_t, or it shouldn't receive the signal at all.
    
    Change sigqueue_free() to clear SIGQUEUE_PREALLOC but leave sigqueue on list
    if it is queued.
    
    This is a user-visible change. If the signal is blocked, it stays queued
    after sys_timer_delete() until unblocked with the "stale" si_code/si_value,
    and of course it is still counted wrt RLIMIT_SIGPENDING which also limits
    the number of posix timers.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Austin Clements <amdragon+kernelbugzilla@mit.edu>
    Cc: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

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

    torvalds authored
    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c: Align i2c_device_id
      tuner: Do not alter i2c_client.name
  5. @torvalds

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

    torvalds authored
    …/git/penberg/slab-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: ksize() abuse checks
      slob: Fix to return wrong pointer
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
      sh: Drop broken URAM support on SH7723.
      sh: update Migo-R defconfig
      sh: use sm501 8250 mfd support on r2d boards
      sh: add probe support for new sh7723 cut
      sh: fix VPU interrupt vector for sh7723
      sh: fix USBF resource for sh7722
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: global_reg_snapshot is not for userspace
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
      vlan: Use bitmask of feature flags instead of seperate feature bits
      fmvj18x_cs: add NextCom NC5310 rev B support
      xirc2ps_cs: re-initialize the multicast address in do_reset
      3C509: rx_bytes should not be increased when alloc_skb failed
      NETFRONT: Use __skb_queue_purge()
      VIRTIO: Use __skb_queue_purge()
      phylib: do EXPORT_SYMBOL on get_phy_id
      netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
      WAN: protect HDLC proto list while insmod/rmmod
      drivers/net/fs_enet: remove null pointer dereference
      S2io: Version update for napi and MSI-X patches
      S2io: Added napi support when MSIX is enabled.
      S2io: Move all the transmit completions to a single msi-x (alarm) vector
      drivers/net/ehea - remove unnecessary memset after kzalloc
      au1000_eth: remove useless check
      Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
      cpmac bugfixes and enhancements
      e1000e: use resource_size_t, not unsigned long, for phys addrs
      net/usb: add support for Apple USB Ethernet Adapter
      uli526x: add support for netpoll
      ...
  9. @jirislaby

    i2c: Align i2c_device_id

    jirislaby authored Jean Delvare committed
    Align i2c_device_id.driver_data to 8 bytes to not fail on crossbuilds.
    
    (Added in d2653e9.)
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  10. @mkrufky

    tuner: Do not alter i2c_client.name

    mkrufky authored Jean Delvare committed
    The tuner driver used to change i2c_client.name for its own needs, but
    it really shouldn't, as this field is used by i2c-core to do the
    device/driver matching. So, create and use a separate field for the
    tuner driver needs.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  11. @davem330

    sparc64: global_reg_snapshot is not for userspace

    Adrian Bunk authored davem330 committed
    global_reg_snapshot shouldn't be visible in our userspace headers.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. @pmundt

    sh: Drop broken URAM support on SH7723.

    pmundt authored
    This was copied over from the previous MobileR bits, which doesn't
    apply to R2. The URAM block on R2 is recycled for the L2 instead.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Commits on May 25, 2008
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
      .gitignore: match ncscope.out
      scripts/ver_linux use 'gcc -dumpversion'
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
      [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
      [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
      [WATCHDOG] hpwdt: Fix NMI handling.
      [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
      [WATCHDOG] Add w83697h_wdt early_disable option
      [WATCHDOG] Make w83697h_wdt timeout option string similar to others
      [WATCHDOG] Make w83697h_wdt void-like functions void
  3. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] hda - Fix capture mute Widget for stac9250/9251
      [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number
      [ALSA] hda - Added support for Foxconn P35AX-S mainboard
      [ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode
      [ALSA] hda - Fix noise on VT1708 codec
      [ALSA] hda - Add model for ASUS P5K-E/WIFI-AP
  4. Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST

    Sam Ravnborg authored
    init/Kconfig contains a list of configs that are searched
    for if 'make *config' are used with no .config present.
    Extend this list to look at the config identified by
    ARCH_DEFCONFIG.
    
    With this change we now try the defconfig targets last.
    
    This fixes a regression reported
    by: Linus Torvalds <torvalds@linux-foundation.org>
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
  5. .gitignore: match ncscope.out

    Jike Song authored Sam Ravnborg committed
    Sometimes I got this:
    
        $ git-status
        {snip}
        # On branch master
        # Untracked files:
        #   (use "git add <file>..." to include in what will be committed)
        #
        #       ncscope.out
        nothing added to commit but untracked files present (use "git add"
    to track)
    
    Fix it.
    
    Signed-off-by: Jike Song <albcamus@gmail.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  6. scripts/ver_linux use 'gcc -dumpversion'

    Gabriel C authored Sam Ravnborg committed
    These magic greps and hacks in ver_linux to get the gcc version always break after some gcc releases.
    
    Since now gcc >4.3 allows compiling with '--with-pkgversion' ( which can be everything 'My Cool Gcc' or something )
    ver_linux will report random junk for these.
    
    Simply use 'gcc -dumpversion' to get the gcc version which should always work.
    
    Signed-off-by: Gabriel C <nix.or.die@googlemail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  7. @mchehab @tiwai

    [ALSA] hda - Fix capture mute Widget for stac9250/9251

    mchehab authored tiwai committed
    Fix capture mute widget for STAC9250/9251 codecs.  The widget 0x09
    has no mute but 0x14 does actually.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  8. @tiwai

    [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number

    Stas Sergeev authored tiwai committed
    This solves the problem with mixers wrongly displaying the PWM freq.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  9. [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver

    Gabriel C authored Wim Van Sebroeck committed
    Add the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bump
    the driver version.
    
    Tested on an P5E-VM DO ASUS motherboard.
    
    Signed-off-by: Gabriel Craciunescu <nix.or.die@googlemail.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  10. [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's

    Chen Gong authored Wim Van Sebroeck committed
    On Book-E SMP systems each core has its own private watchdog.  If only one
    watchdog is enabled, when the core that doesn't enable the watchdog is hung,
    system can't reset because no watchdog is running on it.  That's bad.  It
    means we must enable watchdogs on both cores.
    
    We can use smp_call_function() to send appropriate messages to all the other
    cores to enable and update the watchdog.
    
    Signed-off-by: Chen Gong <g.chen@freescale.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  11. [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers

    Jordan Crouse authored Wim Van Sebroeck committed
    Add a watchdog timer based on the MFGPT timers in the CS5535/CS5536
    companion chips to the AMD Geode GX and LX processors.  Only caveat
    is that the BIOS must provide at least a one free timer, and most
    do not.
    
    Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  12. [WATCHDOG] hpwdt: Fix NMI handling.

    Mingarelli, Thomas authored Wim Van Sebroeck committed
    I need to just return in case it's not my NMI so someone else can take a look
    at it (and reset die_nmi_called to 0 in case I actually do get one that's mine
    to handle).
    
    Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  13. [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver

    Mike Frysinger authored Wim Van Sebroeck committed
     - split platform device/driver registering from actual watchdog device/driver
       registering so that we can cleanly load/unload
     - fixup __initdata with __initconst and __devinitdata with __devinitconst
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  14. @samueltardieu

    [WATCHDOG] Add w83697h_wdt early_disable option

    samueltardieu authored Wim Van Sebroeck committed
    Pádraig Brady requested the possibility of not disabling the watchdog
    at module load time or kernel boot time if it had been previously enabled
    in the bios. It may help rebooting the machine if it freezes before the
    userland daemon kicks in.
    
    Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
    Cc: Pádraig Brady <P@draigBrady.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  15. @samueltardieu

    [WATCHDOG] Make w83697h_wdt timeout option string similar to others

    samueltardieu authored Wim Van Sebroeck committed
    Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  16. @samueltardieu

    [WATCHDOG] Make w83697h_wdt void-like functions void

    samueltardieu authored Wim Van Sebroeck committed
    Some non-exported functions always returned 0. Mark them void instead.
    
    Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Commits on May 24, 2008
  1. @torvalds

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

    torvalds authored
    …nux/kernel/git/x86/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
      x86: prevent PGE flush from interruption/preemption
      x86: use explicit copy in vdso_gettimeofday()
      namespacecheck: automated fixes
      x86/xen: fix arbitrary_virt_to_machine()
      x86: don't read maxlvt before checking if APIC is mapped
      x86: disable TSC for sched_clock() when calibration failed
      x86: distangle user disabled TSC from unstable
      x86: fix setup of cyc2ns in tsc_64.c
  2. @torvalds

    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] integrator: fix build warnings and errors
      [ARM] fix OMAP include loops
      Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
      [ARM] 5053/1: define before use of processor_id
      [ARM] 5052/1: export clock functions for the at91x40
      [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
      [ARM] omap: fix omap clk support build errors
      [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
      [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
      [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
      [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
      [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
      [ARM] 5025/2: fix collie cpu initialisation
  3. @torvalds

    spi: remove some spidev oops-on-rmmod paths

    David Brownell authored torvalds committed
    Somehow the spidev code forgot to include a critical mechanism: when the
    underlying device is removed (e.g.  spi_master rmmod), open file
    descriptors must be prevented from issuing new I/O requests to that
    device.  On penalty of the oopsing reported by Sebastian Siewior
    <bigeasy@tglx.de> ...
    
    This is a partial fix, adding handshaking between the lower level (SPI
    messaging) and the file operations using the spi_dev.  (It also fixes an
    issue where reads and writes didn't return the number of bytes sent or
    received.)
    
    There's still a refcounting issue to be addressed (separately).
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Reported-by: Sebastian Siewior <bigeasy@tglx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @legoater @torvalds

    cgroups: remove node_ prefix_from ns subsystem

    legoater authored torvalds committed
    This is a slight change in the namespace cgroup subsystem api.
    
    The change is that previously when cgroup_clone() was called (currently
    only from the unshare path in ns_proxy cgroup, you'd get a new group named
    "node_$pid" whereas now you'll get a group named after just your pid.)
    
    The only users who would notice it are those who are using the ns_proxy
    cgroup subsystem to auto-create cgroups when namespaces are unshared -
    something of an experimental feature, which I think really needs more
    complete container/namespace support in order to be useful.  I suspect the
    only users are Cedric and Serge, or maybe a few others on
    containers@lists.linux-foundation.org.  And in fact it would only be
    noticed by the users who make the assumption about how the name is
    generated, rather than getting it from the /proc/<pid>/cgroups file for
    the process in question.
    
    Whether the change is actually needed or not I'm fairly agnostic on, but I
    guess it is more elegant to just use the pid as the new group name rather
    than adding a fairly arbitrary "node_" prefix on the front.
    
    [menage@google.com: provided changelog]
    Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
    Cc: "Paul Menage" <menage@google.com>
    Cc: "Serge E. Hallyn" <serue@us.ibm.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    for_each_online_pgdat(): kerneldoc fix

    Fernando Luis Vazquez Cao authored torvalds committed
    for_each_pgdat() was renamed to for_each_online_pgdat() and kerneldoc
    comments should be updated accordingly.
    
    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    frv: export empty_zero_page

    Adrian Bunk authored torvalds committed
    Fix the following build error:
    
    ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
    
    Reported-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Cc: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @shiwh @torvalds

    sys_prctl(): fix return of uninitialized value

    shiwh authored torvalds committed
    If none of the switch cases match, the PR_SET_PDEATHSIG and
    PR_SET_DUMPABLE cases of the switch statement will never write to local
    variable `error'.
    
    Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
    Cc: Andrew G. Morgan <morgan@kernel.org>
    Acked-by: "Serge E. Hallyn" <serue@us.ibm.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.