x86 mmiotrace: move files into arch/x86/mm/.

Signed-off-by: Pekka Paalanen <pq@iki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
git-mirror · May 24, 2008 · ff3a3e9 · ff3a3e9
1 parent 4902316
commit ff3a3e9
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
@@ -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
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
@@ -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

diff --git a/arch/x86/kernel/mmiotrace/kmmio.c → arch/x86/mm/kmmio.c b/arch/x86/kernel/mmiotrace/kmmio.c → arch/x86/mm/kmmio.c
diff --git a/arch/x86/kernel/mmiotrace/mmio-mod.c → arch/x86/mm/mmio-mod.c b/arch/x86/kernel/mmiotrace/mmio-mod.c → arch/x86/mm/mmio-mod.c
diff --git a/arch/x86/kernel/mmiotrace/pf_in.c → arch/x86/mm/pf_in.c b/arch/x86/kernel/mmiotrace/pf_in.c → arch/x86/mm/pf_in.c
diff --git a/arch/x86/kernel/mmiotrace/pf_in.h → arch/x86/mm/pf_in.h b/arch/x86/kernel/mmiotrace/pf_in.h → arch/x86/mm/pf_in.h
diff --git a/arch/x86/kernel/mmiotrace/testmmiotrace.c → arch/x86/mm/testmmiotrace.c b/arch/x86/kernel/mmiotrace/testmmiotrace.c → arch/x86/mm/testmmiotrace.c