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>

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index a51ac153685e21d9046495e7f99e83ff99bea000..739d49acd2f10b795f3dc8723b34b344f4275360 100644 (file)
--- 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
deleted file mode 100644 (file)
index dbcd8d5..0000000
--- a/arch/x86/kernel/mmiotrace/Makefile
+++ /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

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index b7b3e4c7cfc9c4cd35e953ba75d64ad7cde484f5..07dab503c9e37de210223f56538bc8816140204d 100644 (file)
--- 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 b/arch/x86/mm/kmmio.c
similarity index 100%
rename from arch/x86/kernel/mmiotrace/kmmio.c
rename to arch/x86/mm/kmmio.c

diff --git a/arch/x86/kernel/mmiotrace/mmio-mod.c b/arch/x86/mm/mmio-mod.c
similarity index 100%
rename from arch/x86/kernel/mmiotrace/mmio-mod.c
rename to arch/x86/mm/mmio-mod.c

diff --git a/arch/x86/kernel/mmiotrace/pf_in.c b/arch/x86/mm/pf_in.c
similarity index 100%
rename from arch/x86/kernel/mmiotrace/pf_in.c
rename to arch/x86/mm/pf_in.c

diff --git a/arch/x86/kernel/mmiotrace/pf_in.h b/arch/x86/mm/pf_in.h
similarity index 100%
rename from arch/x86/kernel/mmiotrace/pf_in.h
rename to arch/x86/mm/pf_in.h

diff --git a/arch/x86/kernel/mmiotrace/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
similarity index 100%
rename from arch/x86/kernel/mmiotrace/testmmiotrace.c
rename to arch/x86/mm/testmmiotrace.c