1. 18 Apr, 2008 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 4cba84b5
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (36 commits)
        [S390] Remove code duplication from monreader / dcssblk.
        [S390] kernel: show last breaking-event-address on oops
        [S390] lowcore: Change type of lowcores softirq_pending to __u32.
        [S390] zcrypt: Comments and kernel-doc cleanup
        [S390] uaccess: Always access the correct address space.
        [S390] Fix a lot of sparse warnings.
        [S390] Convert s390 to GENERIC_CLOCKEVENTS.
        [S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h
        [S390] Convert monitor calls to function calls.
        [S390] qdio (new feature): enhancing info-retrieval from QDIO-adapters
        [S390] replace remaining __FUNCTION__ occurrences
        [S390] remove redundant display of free swap space in show_mem()
        [S390] qdio: remove outdated developerworks link.
        [S390] Add debug_register_mode() function to debug feature API
        [S390] crypto: use more descriptive function names for init/exit routines.
        [S390] switch sched_clock to store-clock-extended.
        [S390] zcrypt: add support for large random numbers
        [S390] hw_random: allow rng_dev_read() to return hardware errors.
        [S390] Vertical cpu management.
        [S390] cpu topology support for s390.
        ...
      4cba84b5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 7d939fbd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: No need for per node slab counters if !SLUB_DEBUG
        slub: Move map/flag clearing to __free_slab
        slub: Fixes to per cpu stat output in sysfs
        slub: Deal with config variable dependencies
        slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic
        slub: Initialize per-cpu stats
      7d939fbd
    • Roland McGrath's avatar
      ptrace_signal subroutine · 18c98b65
      Roland McGrath authored
      This breaks out the ptrace handling from get_signal_to_deliver into a
      new subroutine.  The actual code there doesn't change, and it gets
      inlined into nearly identical compiled code.  This makes the function
      substantially shorter and thus easier to read, and it nicely isolates
      the ptrace magic.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      18c98b65
    • Li Zefan's avatar
      cgroup: fix a race condition in manipulating tsk->cg_list · 0e04388f
      Li Zefan authored
      When I ran a test program to fork mass processes and at the same time
      'cat /cgroup/tasks', I got the following oops:
      
        ------------[ cut here ]------------
        kernel BUG at lib/list_debug.c:72!
        invalid opcode: 0000 [#1] SMP
        Pid: 4178, comm: a.out Not tainted (2.6.25-rc9 #72)
        ...
        Call Trace:
         [<c044a5f9>] ? cgroup_exit+0x55/0x94
         [<c0427acf>] ? do_exit+0x217/0x5ba
         [<c0427ed7>] ? do_group_exit+0.65/0x7c
         [<c0427efd>] ? sys_exit_group+0xf/0x11
         [<c0404842>] ? syscall_call+0x7/0xb
         [<c05e0000>] ? init_cyrix+0x2fa/0x479
        ...
        EIP: [<c04df671>] list_del+0x35/0x53 SS:ESP 0068:ebc7df4
        ---[ end trace caffb7332252612b ]---
        Fixing recursive fault but reboot is needed!
      
      After digging into the code and debugging, I finlly found out a race
      situation:
      
      				do_exit()
      				  ->cgroup_exit()
      				    ->if (!list_empty(&tsk->cg_list))
      				        list_del(&tsk->cg_list);
      
        cgroup_iter_start()
          ->cgroup_enable_task_cg_list()
            ->list_add(&tsk->cg_list, ..);
      
      In this case the list won't be deleted though the process has exited.
      
      We got two bug reports in the past, which seem to be the same bug as
      this one:
      	http://lkml.org/lkml/2008/3/5/332
      	http://lkml.org/lkml/2007/10/17/224
      
      Actually sometimes I got oops on list_del, sometimes oops on list_add.
      And I can change my test program a bit to trigger other oops.
      
      The patch has been tested both on x86_32 and x86_64.
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Acked-by: default avatarPaul Menage <menage@google.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0e04388f
  2. 17 Apr, 2008 36 commits