---

yaml --- r: 25983 b: refs/heads/master c: 1bb858f h: refs/heads/master i: 25981: b45a2f0 25979: 1ba13d1 25975: dd4b558 25967: f747a31 25951: fc327b4 25919: 317d4aa 25855: f6e42e6 v: v3
git-mirror · Apr 19, 2006 · fb41147 · fb41147
1 parent a8a01af
commit fb41147
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab5703b34237da7034800ec2466ceebf88a7e685
+refs/heads/master: 1bb858f27eadc54e24dfa351fcae724cff426de2
diff --git a/trunk/include/asm-i386/atomic.h b/trunk/include/asm-i386/atomic.h
@@ -183,6 +183,7 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
 {
 	int __i;
 #ifdef CONFIG_M386
+	unsigned long flags;
 	if(unlikely(boot_cpu_data.x86==3))
 		goto no_xadd;
 #endif
@@ -196,10 +197,10 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
 
 #ifdef CONFIG_M386
 no_xadd: /* Legacy 386 processor */
-	local_irq_disable();
+	local_irq_save(flags);
 	__i = atomic_read(v);
 	atomic_set(v, i + __i);
-	local_irq_enable();
+	local_irq_restore(flags);
 	return i + __i;
 #endif
 }