diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-05-23 13:58:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 20:14:15 -0700 |
| commit | 03491c92932b8d2dab1bb298e0122ff6d39680af (patch) | |
| tree | 96db84a9e5c502b7d6890d1af6c94c3f96e83087 | |
| parent | 98d8256739f2c6c636fa2da359f5949c739ae839 (diff) | |
| download | kernel_samsung_aries-03491c92932b8d2dab1bb298e0122ff6d39680af.zip kernel_samsung_aries-03491c92932b8d2dab1bb298e0122ff6d39680af.tar.gz kernel_samsung_aries-03491c92932b8d2dab1bb298e0122ff6d39680af.tar.bz2 | |
i386: fix early usage of atomic_add_return and local_add_return on real i386
The check (boot_cpu_data.x86 == 3) in atomic_add_return() and
local_add_return() fails, when those operations are used before
boot_cpu_data is filled in.
Change the check to (boot_cpu_data.x86 <= 3) to fix this.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/asm-i386/atomic.h | 2 | ||||
| -rw-r--r-- | include/asm-i386/local.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h index 0baa2f8..437aac8 100644 --- a/include/asm-i386/atomic.h +++ b/include/asm-i386/atomic.h @@ -182,7 +182,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)) + if(unlikely(boot_cpu_data.x86 <= 3)) goto no_xadd; #endif /* Modern 486+ processor */ diff --git a/include/asm-i386/local.h b/include/asm-i386/local.h index e13d3e9..6e85975 100644 --- a/include/asm-i386/local.h +++ b/include/asm-i386/local.h @@ -135,7 +135,7 @@ static __inline__ long local_add_return(long i, local_t *l) long __i; #ifdef CONFIG_M386 unsigned long flags; - if(unlikely(boot_cpu_data.x86==3)) + if(unlikely(boot_cpu_data.x86 <= 3)) goto no_xadd; #endif /* Modern 486+ processor */ |