Merge branch 'x86/numa' into x86/urgent

Browse source

Merge reason: Topic is ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2011-01-10 09:35:57 +01:00

parent 30285c6f03 d906f0eb2f

commit 9adcc4a127

6 changed files with 225 additions and 63 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

11

arch/x86/include/asm/acpi.h

View file

6

arch/x86/include/asm/amd_nb.h

View file

2

arch/x86/include/asm/numa_64.h

View file

86

arch/x86/mm/amdtopology_64.c

View file

161

arch/x86/mm/numa_64.c

View file

26

arch/x86/mm/srat_64.c

View file