From 03491c92932b8d2dab1bb298e0122ff6d39680af Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 23 May 2007 13:58:19 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-i386/atomic.h | 2 +- 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 0baa2f89463c..437aac801711 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 e13d3e98823f..6e85975b9ed2 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 */ -- cgit v1.2.2