From d366e2e12f5b097c169856f13cbd595db60f0ff0 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 22 Jul 2008 21:09:02 +0200
Subject: [PATCH] --- yaml --- r: 113599 b: refs/heads/master c:
 a4c408a41167949f820e2740e56a8f2f7bb6177c h: refs/heads/master i:   113597:
 45364ed371b1447938eac3fb1d2c768626461295   113595:
 68cfe3ac7816b37de148f62cb15b1e8d9760bd73   113591:
 2b1ed56156bc19bca429fe87e0b07dec273bbf30   113583:
 3abe493a86a3442e2475724b514328cf96ef350d   113567:
 a4a5c991b92256b323db7410af9442b6faf10801   113535:
 dcfe9fd81e15347830438ebe6ef0ea521f2d66d9 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/x86/oprofile/op_model_athlon.c | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f09032ff3ce4..c8c2970fbbf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 270d3e1a10e6ef85d5a085377e01d91dbcbe3726
+refs/heads/master: a4c408a41167949f820e2740e56a8f2f7bb6177c
diff --git a/trunk/arch/x86/oprofile/op_model_athlon.c b/trunk/arch/x86/oprofile/op_model_athlon.c
index 0d8390319797..1acb067bd343 100644
--- a/trunk/arch/x86/oprofile/op_model_athlon.c
+++ b/trunk/arch/x86/oprofile/op_model_athlon.c
@@ -361,6 +361,26 @@ static void op_amd_shutdown(struct op_msrs const * const msrs)
 	}
 }
 
+#ifndef CONFIG_SMP
+
+/* no IBS support */
+
+static void setup_ibs(void)
+{
+	ibs_allowed = 0;
+}
+
+static void clear_ibs_nmi(void) {}
+
+static int op_amd_init(struct oprofile_operations *ops)
+{
+	return 0;
+}
+
+static void op_amd_exit(void) {}
+
+#else
+
 static u8 ibs_eilvt_off;
 
 static inline void apic_init_ibs_nmi_per_cpu(void *arg)
@@ -505,6 +525,8 @@ static void op_amd_exit(void)
 	clear_ibs_nmi();
 }
 
+#endif
+
 struct op_x86_model_spec const op_amd_spec = {
 	.init = op_amd_init,
 	.exit = op_amd_exit,