diff options
-rw-r--r-- | arch/i386/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/mm/Makefile (renamed from arch/i386/mm/Makefile) | 2 | ||||
-rw-r--r-- | arch/x86/mm/Makefile_32 (renamed from arch/i386/mm/Makefile_32) | 0 | ||||
-rw-r--r-- | arch/x86/mm/boot_ioremap_32.c (renamed from arch/i386/mm/boot_ioremap_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/discontig_32.c (renamed from arch/i386/mm/discontig_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/extable_32.c (renamed from arch/i386/mm/extable_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/fault_32.c (renamed from arch/i386/mm/fault_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/highmem_32.c (renamed from arch/i386/mm/highmem_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/hugetlbpage.c (renamed from arch/i386/mm/hugetlbpage.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/init_32.c (renamed from arch/i386/mm/init_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/ioremap_32.c (renamed from arch/i386/mm/ioremap_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/mmap_32.c (renamed from arch/i386/mm/mmap_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/pageattr_32.c (renamed from arch/i386/mm/pageattr_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/mm/pgtable_32.c (renamed from arch/i386/mm/pgtable_32.c) | 0 | ||||
-rw-r--r-- | arch/x86_64/mm/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/mm/Makefile_64 | 2 |
16 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 776d8dc..cbdc14f 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -103,7 +103,7 @@ head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o libs-y += arch/x86/lib/ core-y += arch/i386/kernel/ \ - arch/i386/mm/ \ + arch/x86/mm/ \ $(mcore-y)/ \ arch/x86/crypto/ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ diff --git a/arch/i386/mm/Makefile b/arch/x86/mm/Makefile index 4042f85..7317648 100644 --- a/arch/i386/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/mm/Makefile_32 +include ${srctree}/arch/x86/mm/Makefile_32 else include ${srctree}/arch/x86_64/mm/Makefile_64 endif diff --git a/arch/i386/mm/Makefile_32 b/arch/x86/mm/Makefile_32 index 362b4ad..362b4ad 100644 --- a/arch/i386/mm/Makefile_32 +++ b/arch/x86/mm/Makefile_32 diff --git a/arch/i386/mm/boot_ioremap_32.c b/arch/x86/mm/boot_ioremap_32.c index 4de95a1..4de95a1 100644 --- a/arch/i386/mm/boot_ioremap_32.c +++ b/arch/x86/mm/boot_ioremap_32.c diff --git a/arch/i386/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 860e912..860e912 100644 --- a/arch/i386/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c diff --git a/arch/i386/mm/extable_32.c b/arch/x86/mm/extable_32.c index 0ce4f22..0ce4f22 100644 --- a/arch/i386/mm/extable_32.c +++ b/arch/x86/mm/extable_32.c diff --git a/arch/i386/mm/fault_32.c b/arch/x86/mm/fault_32.c index fcb38e7..fcb38e7 100644 --- a/arch/i386/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c diff --git a/arch/i386/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 1c3bf95..1c3bf95 100644 --- a/arch/i386/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c diff --git a/arch/i386/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index 6c06d9c..6c06d9c 100644 --- a/arch/i386/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c diff --git a/arch/i386/mm/init_32.c b/arch/x86/mm/init_32.c index 730a5b1..730a5b1 100644 --- a/arch/i386/mm/init_32.c +++ b/arch/x86/mm/init_32.c diff --git a/arch/i386/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c index 0b27831..0b27831 100644 --- a/arch/i386/mm/ioremap_32.c +++ b/arch/x86/mm/ioremap_32.c diff --git a/arch/i386/mm/mmap_32.c b/arch/x86/mm/mmap_32.c index 552e084..552e084 100644 --- a/arch/i386/mm/mmap_32.c +++ b/arch/x86/mm/mmap_32.c diff --git a/arch/i386/mm/pageattr_32.c b/arch/x86/mm/pageattr_32.c index 4241a74..4241a74 100644 --- a/arch/i386/mm/pageattr_32.c +++ b/arch/x86/mm/pageattr_32.c diff --git a/arch/i386/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 01437c4..01437c4 100644 --- a/arch/i386/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile index 4042f85..7317648 100644 --- a/arch/x86_64/mm/Makefile +++ b/arch/x86_64/mm/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/mm/Makefile_32 +include ${srctree}/arch/x86/mm/Makefile_32 else include ${srctree}/arch/x86_64/mm/Makefile_64 endif diff --git a/arch/x86_64/mm/Makefile_64 b/arch/x86_64/mm/Makefile_64 index 2e20988..5c2883c 100644 --- a/arch/x86_64/mm/Makefile_64 +++ b/arch/x86_64/mm/Makefile_64 @@ -8,4 +8,4 @@ obj-$(CONFIG_NUMA) += numa_64.o obj-$(CONFIG_K8_NUMA) += k8topology_64.o obj-$(CONFIG_ACPI_NUMA) += srat_64.o -hugetlbpage-y = ../../i386/mm/hugetlbpage.o +hugetlbpage-y = ../../x86/mm/hugetlbpage.o |