diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/asm-cris/system.h | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-cris/system.h')
-rw-r--r-- | include/asm-cris/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h index e06739806d4e..d48670107a85 100644 --- a/include/asm-cris/system.h +++ b/include/asm-cris/system.h | |||
@@ -41,7 +41,7 @@ extern struct task_struct *resume(struct task_struct *prev, struct task_struct * | |||
41 | void disable_hlt(void); | 41 | void disable_hlt(void); |
42 | void enable_hlt(void); | 42 | void enable_hlt(void); |
43 | 43 | ||
44 | extern inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | 44 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) |
45 | { | 45 | { |
46 | /* since Etrax doesn't have any atomic xchg instructions, we need to disable | 46 | /* since Etrax doesn't have any atomic xchg instructions, we need to disable |
47 | irq's (if enabled) and do it with move.d's */ | 47 | irq's (if enabled) and do it with move.d's */ |