Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, numa: Fix cpu nodemasks for NUMA emulation and CONFIG_DEBUG_PER_CPU_MAPS
  Revert "x86, NUMA: Fix fakenuma boot failure"

...

This commit is contained in:

Linus Torvalds 2011-04-21 10:01:03 -07:00

parent d76c8420c3 7a6c654782

commit d20dc4d523

4 changed files with 20 additions and 56 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/include/asm/numa.h

View file

23

arch/x86/kernel/smpboot.c

View file

39

arch/x86/mm/numa.c

View file

20

arch/x86/mm/numa_emulation.c

View file