From 5f71d6614708cd84a5d97a079f86b5e8fb2314f7 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:16:55 +0200
Subject: [PATCH] --- yaml --- r: 65566 b: refs/heads/master c:
 ff4395654dc6a3a5e35611940047114d4f3d0a7a h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/i386/Kconfig                             | 2 +-
 trunk/arch/i386/Makefile                            | 2 +-
 trunk/arch/{i386 => x86}/oprofile/Kconfig           | 0
 trunk/arch/{i386 => x86}/oprofile/Makefile          | 0
 trunk/arch/{i386 => x86}/oprofile/backtrace.c       | 0
 trunk/arch/{i386 => x86}/oprofile/init.c            | 0
 trunk/arch/{i386 => x86}/oprofile/nmi_int.c         | 0
 trunk/arch/{i386 => x86}/oprofile/nmi_timer_int.c   | 0
 trunk/arch/{i386 => x86}/oprofile/op_counter.h      | 0
 trunk/arch/{i386 => x86}/oprofile/op_model_athlon.c | 0
 trunk/arch/{i386 => x86}/oprofile/op_model_p4.c     | 0
 trunk/arch/{i386 => x86}/oprofile/op_model_ppro.c   | 0
 trunk/arch/{i386 => x86}/oprofile/op_x86_model.h    | 0
 trunk/arch/x86_64/Makefile                          | 2 +-
 15 files changed, 4 insertions(+), 4 deletions(-)
 rename trunk/arch/{i386 => x86}/oprofile/Kconfig (100%)
 rename trunk/arch/{i386 => x86}/oprofile/Makefile (100%)
 rename trunk/arch/{i386 => x86}/oprofile/backtrace.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/init.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/nmi_int.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/nmi_timer_int.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/op_counter.h (100%)
 rename trunk/arch/{i386 => x86}/oprofile/op_model_athlon.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/op_model_p4.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/op_model_ppro.c (100%)
 rename trunk/arch/{i386 => x86}/oprofile/op_x86_model.h (100%)

diff --git a/[refs] b/[refs]
index b0939fd00644..b9e375329aed 100644
--- 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
index 0f6186f03034..2d85e4b87307 100644
--- 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
index e03c47e56c76..4d1c0015e443 100644
--- 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 b/trunk/arch/x86/oprofile/Kconfig
similarity index 100%
rename from trunk/arch/i386/oprofile/Kconfig
rename to trunk/arch/x86/oprofile/Kconfig
diff --git a/trunk/arch/i386/oprofile/Makefile b/trunk/arch/x86/oprofile/Makefile
similarity index 100%
rename from trunk/arch/i386/oprofile/Makefile
rename to trunk/arch/x86/oprofile/Makefile
diff --git a/trunk/arch/i386/oprofile/backtrace.c b/trunk/arch/x86/oprofile/backtrace.c
similarity index 100%
rename from trunk/arch/i386/oprofile/backtrace.c
rename to trunk/arch/x86/oprofile/backtrace.c
diff --git a/trunk/arch/i386/oprofile/init.c b/trunk/arch/x86/oprofile/init.c
similarity index 100%
rename from trunk/arch/i386/oprofile/init.c
rename to trunk/arch/x86/oprofile/init.c
diff --git a/trunk/arch/i386/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
similarity index 100%
rename from trunk/arch/i386/oprofile/nmi_int.c
rename to trunk/arch/x86/oprofile/nmi_int.c
diff --git a/trunk/arch/i386/oprofile/nmi_timer_int.c b/trunk/arch/x86/oprofile/nmi_timer_int.c
similarity index 100%
rename from trunk/arch/i386/oprofile/nmi_timer_int.c
rename to trunk/arch/x86/oprofile/nmi_timer_int.c
diff --git a/trunk/arch/i386/oprofile/op_counter.h b/trunk/arch/x86/oprofile/op_counter.h
similarity index 100%
rename from trunk/arch/i386/oprofile/op_counter.h
rename to trunk/arch/x86/oprofile/op_counter.h
diff --git a/trunk/arch/i386/oprofile/op_model_athlon.c b/trunk/arch/x86/oprofile/op_model_athlon.c
similarity index 100%
rename from trunk/arch/i386/oprofile/op_model_athlon.c
rename to trunk/arch/x86/oprofile/op_model_athlon.c
diff --git a/trunk/arch/i386/oprofile/op_model_p4.c b/trunk/arch/x86/oprofile/op_model_p4.c
similarity index 100%
rename from trunk/arch/i386/oprofile/op_model_p4.c
rename to trunk/arch/x86/oprofile/op_model_p4.c
diff --git a/trunk/arch/i386/oprofile/op_model_ppro.c b/trunk/arch/x86/oprofile/op_model_ppro.c
similarity index 100%
rename from trunk/arch/i386/oprofile/op_model_ppro.c
rename to trunk/arch/x86/oprofile/op_model_ppro.c
diff --git a/trunk/arch/i386/oprofile/op_x86_model.h b/trunk/arch/x86/oprofile/op_x86_model.h
similarity index 100%
rename from trunk/arch/i386/oprofile/op_x86_model.h
rename to trunk/arch/x86/oprofile/op_x86_model.h
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
index c556b6661514..0416dd2f2dbc 100644
--- 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