Merge branch 'x86/bootmem' into x86/mm

Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree and prevent conflicts. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-11-10 20:48:12 +00:00 · 2011-02-16 09:42:50 +01:00 · 2011-02-16 09:42:50 +01:00 · 02ac81a812
commit 02ac81a812
parent 9a6d44b9ad d2137d5af4
9 changed files with 178 additions and 109 deletions
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c