From ece978e3ee5df595a8c1a097a390e72a084ec35e Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 2 Jun 2007 15:36:37 +0100
Subject: [PATCH] --- yaml --- r: 57411 b: refs/heads/master c:
 f72267c30f5a08f9a77c97417ec120e6943195f8 h: refs/heads/master i:   57409:
 38e181589837de39050f59242c2c605d29c7b469   57407:
 6b51bf8369e55a90ae9df17bfd957c2ea750d557 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/oprofile/op_model_mpcore.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01e6526b9af8..1d74b3db2b3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29c349d22ccda5678a7dfb732093dbd3befcefa3
+refs/heads/master: f72267c30f5a08f9a77c97417ec120e6943195f8
diff --git a/trunk/arch/arm/oprofile/op_model_mpcore.c b/trunk/arch/arm/oprofile/op_model_mpcore.c
index 7791da791f5f..75bae067922d 100644
--- a/trunk/arch/arm/oprofile/op_model_mpcore.c
+++ b/trunk/arch/arm/oprofile/op_model_mpcore.c
@@ -200,8 +200,10 @@ static int em_call_function(int (*fn)(void))
 	data.fn = fn;
 	data.ret = 0;
 
+	preempt_disable();
 	smp_call_function(em_func, &data, 1, 1);
 	em_func(&data);
+	preempt_enable();
 
 	return data.ret;
 }