]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 18:06:59 +0000 (11:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 18:06:59 +0000 (11:06 -0700)
commit65c9a7b36f29d89479bd883de2cb80c43d0d142c
tree63f10cdab2a8c1bd9fe5ff29319323ff59419ef8
parent77bc571c3a5752101df66770dc04af1d767f9277
parentc946bd7b17b6d64f0d5a0d0f4c4bdd4078ea0c91
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "This tree includes a micro-optimization that avoids cr3 switches
  during idling; it fixes corner cases and there's also small cleanups"

Fix up trivial context conflict with the percpu_xx -> this_cpu_xx
changes.

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64: Fix accounting in kernel_physical_mapping_init()
  x86/tlb: Clean up and unify TLB_FLUSH_ALL definition
  x86: Drop obsolete ARCH_BOOTMEM support
  x86, tlb: Switch cr3 in leave_mm() only when needed
  x86/mm: Fix the size calculation of mapping tables
arch/x86/Kconfig
arch/x86/include/asm/tlbflush.h
arch/x86/mm/init.c
arch/x86/mm/init_64.c
arch/x86/mm/tlb.c