x86 mmiotrace: move files into arch/x86/mm/.
Pekka Paalanen [Mon, 12 May 2008 19:20:59 +0000 (21:20 +0200)]
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/x86/kernel/Makefile
arch/x86/kernel/mmiotrace/Makefile [deleted file]
arch/x86/mm/Makefile
arch/x86/mm/kmmio.c [moved from arch/x86/kernel/mmiotrace/kmmio.c with 100% similarity]
arch/x86/mm/mmio-mod.c [moved from arch/x86/kernel/mmiotrace/mmio-mod.c with 100% similarity]
arch/x86/mm/pf_in.c [moved from arch/x86/kernel/mmiotrace/pf_in.c with 100% similarity]
arch/x86/mm/pf_in.h [moved from arch/x86/kernel/mmiotrace/pf_in.h with 100% similarity]
arch/x86/mm/testmmiotrace.c [moved from arch/x86/kernel/mmiotrace/testmmiotrace.c with 100% similarity]

index a51ac15..739d49a 100644 (file)
@@ -79,8 +79,6 @@ obj-$(CONFIG_KGDB)            += kgdb.o
 obj-$(CONFIG_VM86)             += vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 
-obj-$(CONFIG_MMIOTRACE)                += mmiotrace/
-
 obj-$(CONFIG_HPET_TIMER)       += hpet.o
 
 obj-$(CONFIG_K8_NB)            += k8.o
diff --git a/arch/x86/kernel/mmiotrace/Makefile b/arch/x86/kernel/mmiotrace/Makefile
deleted file mode 100644 (file)
index dbcd8d5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_MMIOTRACE_HOOKS)  += kmmio.o
-obj-$(CONFIG_MMIOTRACE)                += mmiotrace.o
-mmiotrace-y                    := pf_in.o mmio-mod.o
-obj-$(CONFIG_MMIOTRACE_TEST)   += testmmiotrace.o
index b7b3e4c..07dab50 100644 (file)
@@ -8,6 +8,11 @@ obj-$(CONFIG_X86_PTDUMP)       += dump_pagetables.o
 
 obj-$(CONFIG_HIGHMEM)          += highmem_32.o
 
+obj-$(CONFIG_MMIOTRACE_HOOKS)  += kmmio.o
+obj-$(CONFIG_MMIOTRACE)                += mmiotrace.o
+mmiotrace-y                    := pf_in.o mmio-mod.o
+obj-$(CONFIG_MMIOTRACE_TEST)   += testmmiotrace.o
+
 ifeq ($(CONFIG_X86_32),y)
 obj-$(CONFIG_NUMA)             += discontig_32.o
 else