diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /include/asm-i386/system.h | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/asm-i386/system.h')
| -rw-r--r-- | include/asm-i386/system.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h index 609756c61676..d69ba937e092 100644 --- a/include/asm-i386/system.h +++ b/include/asm-i386/system.h | |||
| @@ -214,11 +214,6 @@ static inline unsigned long get_limit(unsigned long segment) | |||
| 214 | */ | 214 | */ |
| 215 | 215 | ||
| 216 | 216 | ||
| 217 | /* | ||
| 218 | * Actually only lfence would be needed for mb() because all stores done | ||
| 219 | * by the kernel should be already ordered. But keep a full barrier for now. | ||
| 220 | */ | ||
| 221 | |||
| 222 | #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2) | 217 | #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2) |
| 223 | #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2) | 218 | #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2) |
| 224 | 219 | ||