Merge branches 'x86-fixes-for-linus' and 'x86-uv-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, alternative: Call stop_machine_text_poke() on all cpus
  x86-32: Restore irq stacks NUMA-aware allocations
  x86, memblock: Fix early_node_mem with big reserved region.

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, uv: More Westmere support on SGI UV
  x86, uv: Enable Westmere support on SGI UV

...

This commit is contained in:

Linus Torvalds 2010-10-29 18:58:00 -07:00

parent c0f62edd40 404ba5d7bb 0520bd8438

commit 2d10d8737c

5 changed files with 50 additions and 13 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

21

arch/x86/include/asm/uv/uv_hub.h

View file

2

arch/x86/kernel/alternative.c

View file

24

arch/x86/kernel/apic/x2apic_uv_x.c

View file

9

arch/x86/kernel/irq_32.c

View file

7

arch/x86/mm/numa_64.c

View file