17 Mar, 2011

34 commits


15 Mar, 2011

6 commits

  • Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
    MN10300: atomic_read() should ensure it emits a load
    MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not exist
    MN10300: Proper use of macros get_user() in the case of incremented pointers

    Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits)
    MIPS: Alchemy: Fix reset for MTX-1 and XXS1500
    MIPS: MTX-1: Make au1000_eth probe all PHY addresses
    MIPS: Jz4740: Add HAVE_CLK
    MIPS: Move idle task creation to work queue
    MIPS, Perf-events: Use unsigned delta for right shift in event update
    MIPS, Perf-events: Work with the new callchain interface
    MIPS, Perf-events: Fix event check in validate_event()
    MIPS, Perf-events: Work with the new PMU interface
    MIPS, Perf-events: Work with irq_work
    MIPS: Fix always CONFIG_LOONGSON_UART_BASE=y
    MIPS: Loongson: Fix potentially wrong string handling
    MIPS: Fix GCC-4.6 'set but not used' warning in arch/mips/mm/init.c
    MIPS: Fix GCC-4.6 'set but not used' warning in ieee754int.h
    MIPS: Remove unused code from arch/mips/kernel/syscall.c
    MIPS: Fix GCC-4.6 'set but not used' warning in signal*.c
    MIPS: MSP: Fix MSP71xx bpci interrupt handler return value
    MIPS: Select R4K timer lib for all MSP platforms
    MIPS: Loongson: Remove ad-hoc cmdline default
    MIPS: Clear the correct flag in sysmips(MIPS_FIXADE, ...).
    MIPS: Add an unreachable return statement to satisfy buggy GCCs.
    ...

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: ce4100: Set pci ops via callback instead of module init
    x86/mm: Fix pgd_lock deadlock
    x86/mm: Handle mm_fault_error() in kernel space
    x86: Don't check for BIOS corruption in first 64K when there's no need to

    Linus Torvalds
     
  • This reverts the parent commit. I hate doing that, but it's generating
    some discussion ("half of it is right"), and since I am planning on
    doing the 2.6.38 release later today we can punt it to stable if
    required. Let's not rock the boat right now.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • oom_kill_process() starts with victim_points == 0. This means that
    (most likely) any child has more points and can be killed erroneously.

    Also, "children has a different mm" doesn't match the reality, we should
    check child->mm != t->mm. This check is not exactly correct if t->mm ==
    NULL but this doesn't really matter, oom_kill_task() will kill them
    anyway.

    Note: "Kill all processes sharing p->mm" in oom_kill_task() is wrong
    too.

    Signed-off-by: Oleg Nesterov
    Signed-off-by: Linus Torvalds

    Oleg Nesterov