x86: Unify fault_32|64.c
PATCH 3/3 x86: Unify fault_32|64.c
Unify includes in moved fault.c.
Modify Makefiles to pick up unified file.
Signed-off-by Harvey Harrison <[email protected]>
--- arch/x86/mm/Makefile_32 | 2 +- arch/x86/mm/Makefile_64 | 2 +- arch/x86/mm/fault.c | 955 +++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/mm/fault_32.c | 948 ---------------------------------------------- arch/x86/mm/fault_64.c | 951 ---------------------------------------------- 5 files changed, 957 insertions(+), 1901 deletions(-)
arch/x86/mm/Makefile_32 +1 -1
@@ -2,7 +2,7 @@ # Makefile for the linux i386-specific parts of the memory manager. # -obj-y := init_32.o pgtable_32.o fault_32.o ioremap_32.o extable.o pageattr_32.o mmap.o +obj-y := init_32.o pgtable_32.o fault.o ioremap_32.o extable.o pageattr_32.o mmap.o obj-$(CONFIG_CPA_DEBUG) += pageattr-test.o obj-$(CONFIG_NUMA) += discontig_32.o
arch/x86/mm/Makefile_64 +1 -1
@@ -2,7 +2,7 @@ # Makefile for the linux x86_64-specific parts of the memory manager. # -obj-y := init_64.o fault_64.o ioremap_64.o extable.o pageattr_64.o mmap.o +obj-y := init_64.o fault.o ioremap_64.o extable.o pageattr_64.o mmap.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa_64.o obj-$(CONFIG_K8_NUMA) += k8topology_64.o
arch/x86/mm/fault.c new file +955 -0
955 lines not on this page · raw message
arch/x86/mm/fault_32.c deleted +0 -948
948 lines not on this page · raw message
arch/x86/mm/fault_64.c deleted +0 -951
951 lines not on this page · raw message
Signature · 1 line
1.5.4.rc3.1118.gf6754c