Merge branch 'x86/numa' into x86/urgent
Merge reason: Topic is ready for upstream.
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- arch/x86/include/asm/acpi.h 5 additions, 6 deletionsarch/x86/include/asm/acpi.h
- arch/x86/include/asm/amd_nb.h 5 additions, 1 deletionarch/x86/include/asm/amd_nb.h
- arch/x86/include/asm/numa_64.h 1 addition, 1 deletionarch/x86/include/asm/numa_64.h
- arch/x86/mm/amdtopology_64.c 72 additions, 14 deletionsarch/x86/mm/amdtopology_64.c
- arch/x86/mm/numa_64.c 124 additions, 33 deletionsarch/x86/mm/numa_64.c
- arch/x86/mm/srat_64.c 18 additions, 8 deletionsarch/x86/mm/srat_64.c
Please register or sign in to comment