diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-05-23 16:58:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 23:14:15 -0400 |
commit | 03491c92932b8d2dab1bb298e0122ff6d39680af (patch) | |
tree | 96db84a9e5c502b7d6890d1af6c94c3f96e83087 | |
parent | 98d8256739f2c6c636fa2da359f5949c739ae839 (diff) |
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 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) | |||
182 | int __i; | 182 | int __i; |
183 | #ifdef CONFIG_M386 | 183 | #ifdef CONFIG_M386 |
184 | unsigned long flags; | 184 | unsigned long flags; |
185 | if(unlikely(boot_cpu_data.x86==3)) | 185 | if(unlikely(boot_cpu_data.x86 <= 3)) |
186 | goto no_xadd; | 186 | goto no_xadd; |
187 | #endif | 187 | #endif |
188 | /* Modern 486+ processor */ | 188 | /* 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) | |||
135 | long __i; | 135 | long __i; |
136 | #ifdef CONFIG_M386 | 136 | #ifdef CONFIG_M386 |
137 | unsigned long flags; | 137 | unsigned long flags; |
138 | if(unlikely(boot_cpu_data.x86==3)) | 138 | if(unlikely(boot_cpu_data.x86 <= 3)) |
139 | goto no_xadd; | 139 | goto no_xadd; |
140 | #endif | 140 | #endif |
141 | /* Modern 486+ processor */ | 141 | /* Modern 486+ processor */ |