diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/mm/Makefile_64 (renamed from arch/x86_64/mm/Makefile_64) | 1 | ||||
-rw-r--r-- | arch/x86/mm/extable_64.c (renamed from arch/x86_64/mm/extable_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/fault_64.c (renamed from arch/x86_64/mm/fault_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/init_64.c (renamed from arch/x86_64/mm/init_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/ioremap_64.c (renamed from arch/x86_64/mm/ioremap_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/k8topology_64.c (renamed from arch/x86_64/mm/k8topology_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/mmap_64.c (renamed from arch/x86_64/mm/mmap_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/numa_64.c (renamed from arch/x86_64/mm/numa_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/pageattr_64.c (renamed from arch/x86_64/mm/pageattr_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/srat_64.c (renamed from arch/x86_64/mm/srat_64.c) | 0 | ||||
-rw-r--r-- | arch/x86_64/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/mm/Makefile | 5 |
13 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 7317648e658..98329109684 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/mm/Makefile_32 else -include ${srctree}/arch/x86_64/mm/Makefile_64 +include ${srctree}/arch/x86/mm/Makefile_64 endif diff --git a/arch/x86_64/mm/Makefile_64 b/arch/x86/mm/Makefile_64 index 5c2883cad11..6bcb47945b8 100644 --- a/arch/x86_64/mm/Makefile_64 +++ b/arch/x86/mm/Makefile_64 @@ -8,4 +8,3 @@ obj-$(CONFIG_NUMA) += numa_64.o obj-$(CONFIG_K8_NUMA) += k8topology_64.o obj-$(CONFIG_ACPI_NUMA) += srat_64.o -hugetlbpage-y = ../../x86/mm/hugetlbpage.o diff --git a/arch/x86_64/mm/extable_64.c b/arch/x86/mm/extable_64.c index 79ac6e7100a..79ac6e7100a 100644 --- a/arch/x86_64/mm/extable_64.c +++ b/arch/x86/mm/extable_64.c diff --git a/arch/x86_64/mm/fault_64.c b/arch/x86/mm/fault_64.c index 54816adb8e9..54816adb8e9 100644 --- a/arch/x86_64/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c diff --git a/arch/x86_64/mm/init_64.c b/arch/x86/mm/init_64.c index 458893b376f..458893b376f 100644 --- a/arch/x86_64/mm/init_64.c +++ b/arch/x86/mm/init_64.c diff --git a/arch/x86_64/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c index 6cac90aa503..6cac90aa503 100644 --- a/arch/x86_64/mm/ioremap_64.c +++ b/arch/x86/mm/ioremap_64.c diff --git a/arch/x86_64/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c index a96006f7ae0..a96006f7ae0 100644 --- a/arch/x86_64/mm/k8topology_64.c +++ b/arch/x86/mm/k8topology_64.c diff --git a/arch/x86_64/mm/mmap_64.c b/arch/x86/mm/mmap_64.c index 80bba0dc000..80bba0dc000 100644 --- a/arch/x86_64/mm/mmap_64.c +++ b/arch/x86/mm/mmap_64.c diff --git a/arch/x86_64/mm/numa_64.c b/arch/x86/mm/numa_64.c index 6da23552226..6da23552226 100644 --- a/arch/x86_64/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c diff --git a/arch/x86_64/mm/pageattr_64.c b/arch/x86/mm/pageattr_64.c index 10b9809ce82..10b9809ce82 100644 --- a/arch/x86_64/mm/pageattr_64.c +++ b/arch/x86/mm/pageattr_64.c diff --git a/arch/x86_64/mm/srat_64.c b/arch/x86/mm/srat_64.c index acdf03e1914..acdf03e1914 100644 --- a/arch/x86_64/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 11ef2c37ba5..4208a0ded52 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -75,7 +75,7 @@ head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/k libs-y += arch/x86/lib/ core-y += arch/x86_64/kernel/ \ - arch/x86_64/mm/ \ + arch/x86/mm/ \ arch/x86/crypto/ \ arch/x86/vdso/ core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/ diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile deleted file mode 100644 index 7317648e658..00000000000 --- a/arch/x86_64/mm/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/x86/mm/Makefile_32 -else -include ${srctree}/arch/x86_64/mm/Makefile_64 -endif |