From 5d8b09d6b99e3f743ba073557b9e68bc80744bd6 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 3 Jul 2009 08:29:25 -0500 Subject: [PATCH] --- yaml --- r: 182535 b: refs/heads/master c: 17c0e7107bed3d578864e6519f7f4e4c324c8f58 h: refs/heads/master i: 182533: 6dcdafa051c80617e84c2b64823e86e217d448ac 182531: 400117b0a37c8d1b21a83ceeb03a4993000efc23 182527: b993e02ac869b3f571800dcda21c5c8495891ba1 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/atomic.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bee0ed8368f6..230bd877a191 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bef444797f7624f8fbd27f4e0334ce96a108725 +refs/heads/master: 17c0e7107bed3d578864e6519f7f4e4c324c8f58 diff --git a/trunk/arch/x86/include/asm/atomic.h b/trunk/arch/x86/include/asm/atomic.h index 8baaa719fa7f..8f8217b9bdac 100644 --- a/trunk/arch/x86/include/asm/atomic.h +++ b/trunk/arch/x86/include/asm/atomic.h @@ -187,10 +187,10 @@ static inline int atomic_add_return(int i, atomic_t *v) #ifdef CONFIG_M386 no_xadd: /* Legacy 386 processor */ - local_irq_save(flags); + raw_local_irq_save(flags); __i = atomic_read(v); atomic_set(v, i + __i); - local_irq_restore(flags); + raw_local_irq_restore(flags); return i + __i; #endif }