diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-i386/atomic.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
| download | talos-op-linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.tar.gz talos-op-linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.zip | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-i386/atomic.h')
| -rw-r--r-- | include/asm-i386/atomic.h | 2 |
1 files changed, 1 insertions, 1 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 */ |
