diff options
-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 7317648e6587..983291096848 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | ifeq ($(CONFIG_X86_32),y) | 1 | ifeq ($(CONFIG_X86_32),y) |
2 | include ${srctree}/arch/x86/mm/Makefile_32 | 2 | include ${srctree}/arch/x86/mm/Makefile_32 |
3 | else | 3 | else |
4 | include ${srctree}/arch/x86_64/mm/Makefile_64 | 4 | include ${srctree}/arch/x86/mm/Makefile_64 |
5 | endif | 5 | endif |
diff --git a/arch/x86_64/mm/Makefile_64 b/arch/x86/mm/Makefile_64 index 5c2883cad11b..6bcb47945b87 100644 --- a/arch/x86_64/mm/Makefile_64 +++ b/arch/x86/mm/Makefile_64 | |||
@@ -8,4 +8,3 @@ obj-$(CONFIG_NUMA) += numa_64.o | |||
8 | obj-$(CONFIG_K8_NUMA) += k8topology_64.o | 8 | obj-$(CONFIG_K8_NUMA) += k8topology_64.o |
9 | obj-$(CONFIG_ACPI_NUMA) += srat_64.o | 9 | obj-$(CONFIG_ACPI_NUMA) += srat_64.o |
10 | 10 | ||
11 | hugetlbpage-y = ../../x86/mm/hugetlbpage.o | ||
diff --git a/arch/x86_64/mm/extable_64.c b/arch/x86/mm/extable_64.c index 79ac6e7100af..79ac6e7100af 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 54816adb8e93..54816adb8e93 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 458893b376f8..458893b376f8 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 6cac90aa5032..6cac90aa5032 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 a96006f7ae0c..a96006f7ae0c 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 80bba0dc000e..80bba0dc000e 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 6da235522269..6da235522269 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 10b9809ce821..10b9809ce821 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 acdf03e19146..acdf03e19146 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 11ef2c37ba57..4208a0ded529 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 | |||
75 | 75 | ||
76 | libs-y += arch/x86/lib/ | 76 | libs-y += arch/x86/lib/ |
77 | core-y += arch/x86_64/kernel/ \ | 77 | core-y += arch/x86_64/kernel/ \ |
78 | arch/x86_64/mm/ \ | 78 | arch/x86/mm/ \ |
79 | arch/x86/crypto/ \ | 79 | arch/x86/crypto/ \ |
80 | arch/x86/vdso/ | 80 | arch/x86/vdso/ |
81 | core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/ | 81 | 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 7317648e6587..000000000000 --- a/arch/x86_64/mm/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | ifeq ($(CONFIG_X86_32),y) | ||
2 | include ${srctree}/arch/x86/mm/Makefile_32 | ||
3 | else | ||
4 | include ${srctree}/arch/x86_64/mm/Makefile_64 | ||
5 | endif | ||