---

yaml --- r: 100603 b: refs/heads/master c: ff3a3e9 h: refs/heads/master i: 100601: 81e18ca 100599: 308c097 v: v3
git-mirror · May 24, 2008 · a4603f6 · a4603f6
1 parent 3ef7bc8
commit a4603f6
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49023168261a7f9a2fd4a1ca1adbfea922556015
+refs/heads/master: ff3a3e9ba5e4273a8bc10570adab4a390fb90757
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/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/trunk/arch/x86/kernel/mmiotrace/Makefile b/trunk/arch/x86/kernel/mmiotrace/Makefile
diff --git a/trunk/arch/x86/mm/Makefile b/trunk/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/trunk/arch/x86/kernel/mmiotrace/kmmio.c → trunk/arch/x86/mm/kmmio.c b/trunk/arch/x86/kernel/mmiotrace/kmmio.c → trunk/arch/x86/mm/kmmio.c
diff --git a/trunk/arch/x86/kernel/mmiotrace/mmio-mod.c → trunk/arch/x86/mm/mmio-mod.c b/trunk/arch/x86/kernel/mmiotrace/mmio-mod.c → trunk/arch/x86/mm/mmio-mod.c
diff --git a/trunk/arch/x86/kernel/mmiotrace/pf_in.c → trunk/arch/x86/mm/pf_in.c b/trunk/arch/x86/kernel/mmiotrace/pf_in.c → trunk/arch/x86/mm/pf_in.c
diff --git a/trunk/arch/x86/kernel/mmiotrace/pf_in.h → trunk/arch/x86/mm/pf_in.h b/trunk/arch/x86/kernel/mmiotrace/pf_in.h → trunk/arch/x86/mm/pf_in.h
diff --git a/...arch/x86/kernel/mmiotrace/testmmiotrace.c → trunk/arch/x86/mm/testmmiotrace.c b/...arch/x86/kernel/mmiotrace/testmmiotrace.c → trunk/arch/x86/mm/testmmiotrace.c