From 05f7ef5be8b9e60ad0aacd91bfcf9b2dbc7b40da Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Mon, 24 Nov 2008 14:21:03 +0100
Subject: [PATCH] --- yaml --- r: 123474 b: refs/heads/master c:
 9fa6812dbab9207f7af52c3d0417f1f9eb89c386 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/oprofile/op_model_amd.c | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a08e09e6ae22..60db9f83613c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dbc50c322619eb821907e8dba75252f5378c712
+refs/heads/master: 9fa6812dbab9207f7af52c3d0417f1f9eb89c386
diff --git a/trunk/arch/x86/oprofile/op_model_amd.c b/trunk/arch/x86/oprofile/op_model_amd.c
index f71bd218b488..8ff657b3ff89 100644
--- a/trunk/arch/x86/oprofile/op_model_amd.c
+++ b/trunk/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,