Merge branch 'x86/mm' into x86/core

2026-09-26 18:16:26 +00:00 · 2009-03-05 21:49:35 +01:00 · 2009-03-05 21:49:35 +01:00 · 28e93a005b
commit 28e93a005b
parent caab36b593 ed26dbe5ae
13 changed files with 472 additions and 491 deletions
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
--- a/arch/x86/include/asm/pat.h
+++ b/arch/x86/include/asm/pat.h
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c