28 Aug, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
    9p: update documentation pointers
    9p: remove unnecessary v9fses->options which duplicates the mount string
    net/9p: insulate the client against an invalid error code sent by a 9p server
    9p: Add missing cast for the error return value in v9fs_get_inode
    9p: Remove redundant inode uid/gid assignment
    9p: Fix possible regressions when ->get_sb fails.
    9p: Fix v9fs show_options
    9p: Fix possible memleak in v9fs_inode_from fid.
    9p: minor comment fixes
    9p: Fix possible inode leak in v9fs_get_inode.
    9p: Check for error in return value of v9fs_fid_add

    Linus Torvalds
     

20 Aug, 2009

1 commit

  • Fix some issues with the AFS documentation, found when testing AFS on ppc64:

    - Update AFS features: reading/writing, local caching
    - Typo in kafs sysfs debug file
    - Use modprobe instead of insmod in example
    - Update IPs for grand.central.org

    Signed-off-by: Anton Blanchard
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Anton Blanchard
     

19 Aug, 2009

1 commit

  • The commit 2ff05b2b (oom: move oom_adj value) moveed the oom_adj value to
    the mm_struct. It was a very good first step for sanitize OOM.

    However Paul Menage reported the commit makes regression to his job
    scheduler. Current OOM logic can kill OOM_DISABLED process.

    Why? His program has the code of similar to the following.

    ...
    set_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */
    ...
    if (vfork() == 0) {
    set_oom_adj(0); /* Invoked child can be killed */
    execve("foo-bar-cmd");
    }
    ....

    vfork() parent and child are shared the same mm_struct. then above
    set_oom_adj(0) doesn't only change oom_adj for vfork() child, it's also
    change oom_adj for vfork() parent. Then, vfork() parent (job scheduler)
    lost OOM immune and it was killed.

    Actually, fork-setting-exec idiom is very frequently used in userland program.
    We must not break this assumption.

    Then, this patch revert commit 2ff05b2b and related commit.

    Reverted commit list
    ---------------------
    - commit 2ff05b2b4e (oom: move oom_adj value from task_struct to mm_struct)
    - commit 4d8b9135c3 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE)
    - commit 8123681022 (oom: only oom kill exiting tasks with attached memory)
    - commit 933b787b57 (mm: copy over oom_adj value at fork time)

    Signed-off-by: KOSAKI Motohiro
    Cc: Paul Menage
    Cc: David Rientjes
    Cc: KAMEZAWA Hiroyuki
    Cc: Rik van Riel
    Cc: Linus Torvalds
    Cc: Oleg Nesterov
    Cc: Nick Piggin
    Cc: Mel Gorman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     

18 Aug, 2009

1 commit


14 Aug, 2009

3 commits


12 Aug, 2009

1 commit


10 Aug, 2009

2 commits


08 Aug, 2009

1 commit

  • * master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
    ARM: 5639/1: arm: clkdev.c should include
    ARM: 5638/1: arch/arm/kernel/signal.c: use correct address space for CRUNCH
    ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
    ARM: S3C64XX: serial: Fix section mismatch warning
    ARM: S3C24XX: serial: Fix section mismatch warnings
    ARM: S3C: PWM fix for low duty cycle
    ARM: 5597/1: [PCI] reset all internal hardware prior PCI initialization
    ARM: 5627/1: Fix restoring of lr at the end of mcount
    ARM: 5624/1: Document cache aliasing region
    S3C64XX: Fix ARMCLK configuration
    S3C64XX: Fix get_rate() for ARMCLK
    S3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip
    mx3 defconfig update
    mx27 defconfig update
    ARM: 5623/1: Treo680: ir shutdown typo fix
    ARM: includecheck fix: plat-stmp3xxx/pinmux.c
    ARM: includecheck fix: plat-s3c64xx/pm.c
    ARM: includecheck fix: mach-omap2/mcbsp.c
    ARM: includecheck fix: mach-omap1/mcbsp.c
    ARM: includecheck fix: board-sffsdr.c
    ...

    Linus Torvalds
     

07 Aug, 2009

1 commit


05 Aug, 2009

2 commits

  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    Make SCSI SG v4 driver enabled by default and remove EXPERIMENTAL dependency, since udev depends on BSG
    block: Update topology documentation
    block: Stack optimal I/O size
    block: Add a wrapper for setting minimum request size without a queue
    block: Make blk_queue_stack_limits use the new stacking interface

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
    ehea: Fix napi list corruption on ifconfig down
    igbvf: Allow VF driver to correctly recognize failure to set mac
    3c59x: Fix build failure with gcc 3.2
    sky2: Avoid transmits during sky2_down()
    iwlagn: do not send key clear commands when rfkill enabled
    libertas: Read buffer overflow
    drivers/net/wireless: introduce missing kfree
    drivers/net/wireless/iwlwifi: introduce missing kfree
    zd1211rw: fix unaligned access in zd_mac_rx
    cfg80211: fix regression on beacon world roaming feature
    cfg80211: add two missing NULL pointer checks
    ixgbe: Patch to modify 82598 PCIe completion timeout values
    bluetooth: rfcomm_init bug fix
    mlx4_en: Fix double pci unmapping.
    mISDN: Fix handling of receive buffer size in L1oIP
    pcnet32: VLB support fixes
    pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()
    net: restore the original spinlock to protect unicast list
    netxen: fix coherent dma mask setting
    mISDN: Read buffer overflow
    ...

    Linus Torvalds
     

02 Aug, 2009

1 commit

  • The standard ACPI dock driver can handle the hotplug bays and docks of
    the ThinkPads just fine (including batteries) as of 2.6.27, and the
    code in thinkpad-acpi for the dock and bay subdrivers is currently
    broken anyway...

    Userspace needs some love to support the two-stage ejection nicely,
    but it is simple enough to do through udev rules (you don't even need
    HAL) so this wouldn't justify fixing the dock and bay subdrivers,
    either.

    That leaves warm-swap bays (_EJ3) support for thinkpad-acpi, as well
    as support for the weird dock of the model 570, but since such support
    has never left the "experimental" stage, it is also not a strong
    enough reason to find a way to fix this code.

    Users of ThinkPads with warm-swap bays are urged to request that _EJ3
    support be added to the regular ACPI dock driver, if such feature is
    indeed useful for them.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     

01 Aug, 2009

1 commit


31 Jul, 2009

1 commit


30 Jul, 2009

7 commits

  • Russell King
     
  • Augment the memory.txt file for ARM to list the cache aliasing
    region ffff4000-fffffff.

    Signed-off-by: Linus Walleij
    Signed-off-by: Russell King

    Linus Walleij
     
  • I've been doing this for years, and akpm picked me up on it about 12
    months ago. lguest partly serves as example code, so let's do it Right.

    Also, remove two unused fields in struct vblk_info in the example launcher.

    Signed-off-by: Rusty Russell
    Cc: Ingo Molnar

    Rusty Russell
     
  • Every so often, after code shuffles, I need to go through and unbitrot
    the Lguest Journey (see drivers/lguest/README). Since we now use RCU in
    a simple form in one place I took the opportunity to expand that explanation.

    Signed-off-by: Rusty Russell
    Cc: Ingo Molnar
    Cc: Paul McKenney

    Rusty Russell
     
  • I don't really notice it (except to begrudge the extra vertical
    space), but Ingo does. And he pointed out that one excuse of lguest
    is as a teaching tool, it should set a good example.

    Signed-off-by: Rusty Russell
    Cc: Ingo Molnar

    Rusty Russell
     
  • 1d589bb16b825b3a7b4edd34d997f1f1f953033d "Add serial number support
    for virtio_blk, V4a" extended 'struct virtio_blk_config' to 536 bytes.
    Lguest and S/390 both use an 8 bit value for the feature length, and
    this change broke them (if the code is naive).

    Signed-off-by: Rusty Russell
    Cc: John Cooper
    Cc: Christian Borntraeger

    Rusty Russell
     
  • commit d6580a9f15238b87e618310c862231ae3f352d2d ("kexec: sysrq: simplify
    sysrq-c handler") changed the behavior of sysrq-c to unconditional
    dereference of NULL pointer. So in cases with CONFIG_KEXEC, where
    crash_kexec() was directly called from sysrq-c before, now it can be said
    that a step of "real oops" was inserted before starting kdump.

    However, in contrast to oops via SysRq-c from keyboard which results in
    panic due to in_interrupt(), oops via "echo c > /proc/sysrq-trigger" will
    not become panic unless panic_on_oops=1. It means that even if dump is
    properly configured to be taken on panic, the sysrq-c from proc interface
    might not start crashdump while the sysrq-c from keyboard can start
    crashdump. This confuses traditional users of kdump, i.e. people who
    expect sysrq-c to do common behavior in both of the keyboard and proc
    interface.

    This patch brings the keyboard and proc interface behavior of sysrq-c in
    line, by forcing panic_on_oops=1 before oops in sysrq-c handler.

    And some updates in documentation are included, to clarify that there is
    no longer dependency with CONFIG_KEXEC, and that now the system can just
    crash by sysrq-c if no dump mechanism is configured.

    Signed-off-by: Hidetoshi Seto
    Cc: Lai Jiangshan
    Cc: Ken'ichi Ohmichi
    Acked-by: Neil Horman
    Acked-by: Vivek Goyal
    Cc: Brayan Arraes
    Cc: Eric W. Biederman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hidetoshi Seto
     

29 Jul, 2009

1 commit


28 Jul, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Fix mute control with some ALC262 models
    ALSA: snd_usb_caiaq: add support for Audio2DJ
    ALSA: pcm - Fix hwptr buffer-size overlap bug
    ALSA: pcm - Fix warnings in debug loggings
    ALSA: pcm - Add logging of hwptr updates and interrupt updates
    ASoC: tlv320aic3x: Enable PLL when not bypassed
    ALSA: hda - Restore GPIO1 properly at resume with AD1984A
    ALSA: ctxfi - Fix uninitialized error checks
    ALSA: hda - Use snprintf() to be safer
    ALSA: usb-audio - Volume control quirk for QuickCam E 3500
    ALSA: pcm - Fix regressions with VMware

    Linus Torvalds
     

26 Jul, 2009

1 commit


25 Jul, 2009

2 commits


23 Jul, 2009

2 commits

  • Added the logging functionality to xrun_debug to record the hwptr
    updates via snd_pcm_update_hw_ptr() and snd_pcm_update_hwptr_interrupt(),
    corresponding to 16 and 8, respectively.

    For example,
    # echo 9 > /proc/asound/card0/pcm0p/xrun_debug
    will record the position and other parameters at each period interrupt
    together with the normal XRUN debugging.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
    sky2: Avoid races in sky2_down
    drivers/net/mlx4: Adjust constant
    drivers/net: Move a dereference below a NULL test
    drivers/net: Move a dereference below a NULL test
    connector: maintainer/mail update.
    USB host CDC Phonet network interface driver
    macsonic, jazzsonic: fix oops on module unload
    macsonic: move probe function to .devinit.text
    can: switch carrier on if device was stopped while in bus-off state
    can: restart device even if dev_alloc_skb() fails
    can: sja1000: remove duplicated includes
    New device ID for sc92031 [1088:2031]
    3c589_cs: re-initialize the multicast in the tc589_reset
    Fix error return for setsockopt(SO_TIMESTAMPING)
    netxen: fix thermal check and shutdown
    netxen: fix deadlock on dev close
    netxen: fix context deletion sequence
    net: Micrel KS8851 SPI network driver
    tcp: Use correct peer adr when copying MD5 keys
    tcp: Fix MD5 signature checking on IPv4 mapped sockets
    ...

    Linus Torvalds
     

22 Jul, 2009

1 commit


18 Jul, 2009

1 commit


17 Jul, 2009

2 commits


16 Jul, 2009

1 commit

  • When a slab cache uses SLAB_DESTROY_BY_RCU, we must be careful when allocating
    objects, since slab allocator could give a freed object still used by lockless
    readers.

    In particular, nf_conntrack RCU lookups rely on ct->tuplehash[xxx].hnnode.next
    being always valid (ie containing a valid 'nulls' value, or a valid pointer to next
    object in hash chain.)

    kmem_cache_zalloc() setups object with NULL values, but a NULL value is not valid
    for ct->tuplehash[xxx].hnnode.next.

    Fix is to call kmem_cache_alloc() and do the zeroing ourself.

    As spotted by Patrick, we also need to make sure lookup keys are committed to
    memory before setting refcount to 1, or a lockless reader could get a reference
    on the old version of the object. Its key re-check could then pass the barrier.

    Signed-off-by: Eric Dumazet
    Signed-off-by: Patrick McHardy

    Eric Dumazet
     

13 Jul, 2009

1 commit


11 Jul, 2009

3 commits

  • exception.txt only explains the code on x86, so it's better to
    move it into Documentation/x86 directory.

    And also rename it to exception-tables.txt which looks much
    more reasonable.

    This patch is on top of the previous one.

    Signed-off-by: WANG Cong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Amerigo Wang
     
  • Update Documentation/exception.txt.
    Remove trailing whitespaces in it.

    Signed-off-by: WANG Cong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Amerigo Wang
     
  • …el/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    dma-debug: Fix the overlap() function to be correct and readable
    oprofile: reset bt_lost_no_mapping with other stats
    x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon
    signals: declare sys_rt_tgsigqueueinfo in syscalls.h
    rcu: Mark Hierarchical RCU no longer experimental
    dma-debug: Put all hash-chain locks into the same lock class
    dma-debug: fix off-by-one error in overlap function

    Linus Torvalds