aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/oprofile
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-11-24 14:21:03 +0100
committerRobert Richter <robert.richter@amd.com>2008-12-10 14:20:07 +0100
commit9fa6812dbab9207f7af52c3d0417f1f9eb89c386 (patch)
tree7d6bef7921e1401cfcedf1b6527a07c280ad3c6a /arch/x86/oprofile
parent8dbc50c322619eb821907e8dba75252f5378c712 (diff)
x86/oprofile: reordering IBS code in op_model_amd.c
This is part of the cpu buffer rework. Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
-rw-r--r--arch/x86/oprofile/op_model_amd.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index f71bd218b48..8ff657b3ff8 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -376,18 +376,7 @@ static void op_amd_shutdown(struct op_msrs const * const msrs)
}
}
-#ifndef CONFIG_OPROFILE_IBS
-
-/* no IBS support */
-
-static int op_amd_init(struct oprofile_operations *ops)
-{
- return 0;
-}
-
-static void op_amd_exit(void) {}
-
-#else
+#ifdef CONFIG_OPROFILE_IBS
static u8 ibs_eilvt_off;
@@ -531,7 +520,18 @@ static void op_amd_exit(void)
clear_ibs_nmi();
}
-#endif
+#else
+
+/* no IBS support */
+
+static int op_amd_init(struct oprofile_operations *ops)
+{
+ return 0;
+}
+
+static void op_amd_exit(void) {}
+
+#endif /* CONFIG_OPROFILE_IBS */
struct op_x86_model_spec const op_amd_spec = {
.init = op_amd_init,