---

yaml --- r: 65566 b: refs/heads/master c: ff43956 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 5f71d66 · 5f71d66
1 parent 802fa3d
commit 5f71d66
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9402e12b8fef1efe9cf949fc020dcda22d9d8667
+refs/heads/master: ff4395654dc6a3a5e35611940047114d4f3d0a7a
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
@@ -1240,7 +1240,7 @@ menuconfig INSTRUMENTATION
 
 if INSTRUMENTATION
 
-source "arch/i386/oprofile/Kconfig"
+source "arch/x86/oprofile/Kconfig"
 
 config KPROBES
 	bool "Kprobes"

diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
@@ -109,7 +109,7 @@ core-y					+= arch/i386/kernel/ \
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/x86/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/x86/pci/
 # must be linked after kernel/
-drivers-$(CONFIG_OPROFILE)		+= arch/i386/oprofile/
+drivers-$(CONFIG_OPROFILE)		+= arch/x86/oprofile/
 drivers-$(CONFIG_PM)			+= arch/x86/power/
 drivers-$(CONFIG_FB)                    += arch/i386/video/
 

diff --git a/trunk/arch/i386/oprofile/Kconfig → trunk/arch/x86/oprofile/Kconfig b/trunk/arch/i386/oprofile/Kconfig → trunk/arch/x86/oprofile/Kconfig
diff --git a/trunk/arch/i386/oprofile/Makefile → trunk/arch/x86/oprofile/Makefile b/trunk/arch/i386/oprofile/Makefile → trunk/arch/x86/oprofile/Makefile
diff --git a/trunk/arch/i386/oprofile/backtrace.c → trunk/arch/x86/oprofile/backtrace.c b/trunk/arch/i386/oprofile/backtrace.c → trunk/arch/x86/oprofile/backtrace.c
diff --git a/trunk/arch/i386/oprofile/init.c → trunk/arch/x86/oprofile/init.c b/trunk/arch/i386/oprofile/init.c → trunk/arch/x86/oprofile/init.c
diff --git a/trunk/arch/i386/oprofile/nmi_int.c → trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/i386/oprofile/nmi_int.c → trunk/arch/x86/oprofile/nmi_int.c
diff --git a/trunk/arch/i386/oprofile/nmi_timer_int.c → trunk/arch/x86/oprofile/nmi_timer_int.c b/trunk/arch/i386/oprofile/nmi_timer_int.c → trunk/arch/x86/oprofile/nmi_timer_int.c
diff --git a/trunk/arch/i386/oprofile/op_counter.h → trunk/arch/x86/oprofile/op_counter.h b/trunk/arch/i386/oprofile/op_counter.h → trunk/arch/x86/oprofile/op_counter.h
diff --git a/trunk/arch/i386/oprofile/op_model_athlon.c → trunk/arch/x86/oprofile/op_model_athlon.c b/trunk/arch/i386/oprofile/op_model_athlon.c → trunk/arch/x86/oprofile/op_model_athlon.c
diff --git a/trunk/arch/i386/oprofile/op_model_p4.c → trunk/arch/x86/oprofile/op_model_p4.c b/trunk/arch/i386/oprofile/op_model_p4.c → trunk/arch/x86/oprofile/op_model_p4.c
diff --git a/trunk/arch/i386/oprofile/op_model_ppro.c → trunk/arch/x86/oprofile/op_model_ppro.c b/trunk/arch/i386/oprofile/op_model_ppro.c → trunk/arch/x86/oprofile/op_model_ppro.c
diff --git a/trunk/arch/i386/oprofile/op_x86_model.h → trunk/arch/x86/oprofile/op_x86_model.h b/trunk/arch/i386/oprofile/op_x86_model.h → trunk/arch/x86/oprofile/op_x86_model.h
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
@@ -80,7 +80,7 @@ core-y					+= arch/x86_64/kernel/ \
 					   arch/x86_64/vdso/
 core-$(CONFIG_IA32_EMULATION)		+= arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)			+= arch/x86_64/pci/
-drivers-$(CONFIG_OPROFILE)		+= arch/i386/oprofile/
+drivers-$(CONFIG_OPROFILE)		+= arch/x86/oprofile/
 
 boot := arch/x86_64/boot