diff options
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/mmiotrace/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/mm/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/mm/kmmio.c (renamed from arch/x86/kernel/mmiotrace/kmmio.c) | 0 | ||||
| -rw-r--r-- | arch/x86/mm/mmio-mod.c (renamed from arch/x86/kernel/mmiotrace/mmio-mod.c) | 0 | ||||
| -rw-r--r-- | arch/x86/mm/pf_in.c (renamed from arch/x86/kernel/mmiotrace/pf_in.c) | 0 | ||||
| -rw-r--r-- | arch/x86/mm/pf_in.h (renamed from arch/x86/kernel/mmiotrace/pf_in.h) | 0 | ||||
| -rw-r--r-- | arch/x86/mm/testmmiotrace.c (renamed from arch/x86/kernel/mmiotrace/testmmiotrace.c) | 0 |
8 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index a51ac153685e..739d49acd2f1 100644 --- 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 index dbcd8d50fb8d..000000000000 --- 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 b7b3e4c7cfc9..07dab503c9e3 100644 --- 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 index 3ad27b8504a5..3ad27b8504a5 100644 --- a/arch/x86/kernel/mmiotrace/kmmio.c +++ b/arch/x86/mm/kmmio.c diff --git a/arch/x86/kernel/mmiotrace/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 8256546d49bf..8256546d49bf 100644 --- a/arch/x86/kernel/mmiotrace/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c diff --git a/arch/x86/kernel/mmiotrace/pf_in.c b/arch/x86/mm/pf_in.c index efa1911e20ca..efa1911e20ca 100644 --- a/arch/x86/kernel/mmiotrace/pf_in.c +++ b/arch/x86/mm/pf_in.c diff --git a/arch/x86/kernel/mmiotrace/pf_in.h b/arch/x86/mm/pf_in.h index e05341a51a27..e05341a51a27 100644 --- a/arch/x86/kernel/mmiotrace/pf_in.h +++ b/arch/x86/mm/pf_in.h diff --git a/arch/x86/kernel/mmiotrace/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c index cfa60b227c8d..cfa60b227c8d 100644 --- a/arch/x86/kernel/mmiotrace/testmmiotrace.c +++ b/arch/x86/mm/testmmiotrace.c |
