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,