diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-mips/system.h | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'include/asm-mips/system.h')
-rw-r--r-- | include/asm-mips/system.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index ddae9bae31af..4097fac5ac3c 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
@@ -286,10 +286,10 @@ extern void __xchg_called_with_bad_pointer(void); | |||
286 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | 286 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) |
287 | { | 287 | { |
288 | switch (size) { | 288 | switch (size) { |
289 | case 4: | 289 | case 4: |
290 | return __xchg_u32(ptr, x); | 290 | return __xchg_u32(ptr, x); |
291 | case 8: | 291 | case 8: |
292 | return __xchg_u64(ptr, x); | 292 | return __xchg_u64(ptr, x); |
293 | } | 293 | } |
294 | __xchg_called_with_bad_pointer(); | 294 | __xchg_called_with_bad_pointer(); |
295 | return x; | 295 | return x; |