1. 16 5月, 2008 3 次提交
    • I
      tty: fix BKL related leak and crash · 487ad7ef
      Ingo Molnar 提交于
      Enabling the BKL to be lockdep tracked uncovered the following
      upstream kernel bug in the tty code, which caused a BKL
      reference leak:
      
        ================================================
        [ BUG: lock held when returning to user space! ]
        ------------------------------------------------
        dmesg/3121 is leaving the kernel with locks still held!
        1 lock held by dmesg/3121:
         #0:  (kernel_mutex){--..}, at: [<c02f34d9>] opost+0x24/0x194
      
      this might explain some of the atomicity warnings and crashes
      that -tip tree testing has been experiencing since the BKL
      was converted back to a spinlock.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      487ad7ef
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 8568dae2
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
        [S390] smp: __smp_call_function_map vs cpu_online_map fix.
        [S390] tape: Use ccw_dev_id to build cdev_id.
        [S390] dasd: fix timeout handling in interrupt handler
        [S390] s390dbf: Use const char * for dbf name.
        [S390] dasd: Use const in busid functions.
        [S390] blacklist.c: removed duplicated include
        [S390] vmlogrdr: module initialization function should return negative errors
        [S390] sparsemem vmemmap: initialize memmap.
        [S390] Remove last traces of cio_msg=.
        [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.
      8568dae2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · 713c0515
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
        arch/parisc/kernel/perf_asm.S: build fix
        parisc: remove -traditional from assembler flags
        parisc: use conditional macro for 64-bit wide ops
        parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
        arch/parisc/kernel/unaligned.c: use time_* macros
        parisc: remove redundant display of free swap space in show_mem()
        drivers/parisc: replace remaining __FUNCTION__ occurrences
        parisc: replace remaining __FUNCTION__ occurrences
        parisc: new termios definitions
        parisc: fix trivial section name warnings
      713c0515
  2. 15 5月, 2008 37 次提交