1. 22 1月, 2011 3 次提交
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · d41ad6df
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
        powerpc/mpic: Fix mask/unmask timeout message
        powerpc/pseries: Add BNX2=m to defconfig
        powerpc: Enable 64kB pages and 1024 threads in pseries config
        powerpc: Disable mcount tracers in pseries defconfig
        powerpc/boot/dts: Install dts from the right directory
        powerpc: machine_check_generic is wrong on 64bit
        powerpc: Check RTAS extended log flag before checking length
        powerpc: Fix corruption when grabbing FWNMI data
        powerpc: Rework pseries machine check handler
        powerpc: Don't silently handle machine checks from userspace
        powerpc: Remove duplicate debugger hook in machine_check_exception
        powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check
        powerpc: Don't force MSR_RI in machine_check_exception
        powerpc: Print 32 bits of DSISR in show_regs
        powerpc/kdump: Disable ftrace during kexec
        powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler
        powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
        powerpc/kexec: Don't initialise kexec hooks to default handlers
        powerpc/kdump: Remove ppc_md.machine_crash_shutdown
        powerpc/kexec: Remove ppc_md.machine_kexec
        ...
      d41ad6df
    • M
      mm: System without MMU do not need pte_mkwrite · 3dece370
      Michal Simek 提交于
      The patch "thp: export maybe_mkwrite" (commit 14fd403f) breaks
      systems without MMU.
      
      Error log:
      
          CC      arch/microblaze/mm/init.o
        In file included from include/linux/mman.h:14,
                         from arch/microblaze/mm/consistent.c:24:
        include/linux/mm.h: In function 'maybe_mkwrite':
        include/linux/mm.h:482: error: implicit declaration of function 'pte_mkwrite'
        include/linux/mm.h:482: error: incompatible types in assignment
      Signed-off-by: NMichal Simek <monstr@monstr.eu>
      CC: Andrea Arcangeli <aarcange@redhat.com>
      Reviewed-by: NRik van Riel <riel@redhat.com>
      CC: Andrew Morton <akpm@linux-foundation.org>
      CC: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3dece370
    • R
      MAINTAINERS: Update Roland Dreier's email address · db9fd848
      Roland Dreier 提交于
      The cisco.com address will stop working soon, and besides no one can
      remember the second "d" in "rolandd" or how to spell "rdreier."
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      db9fd848
  2. 21 1月, 2011 37 次提交