projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
include
/
asm-m32r
/
system.h
diff --git
a/include/asm-m32r/system.h
b/include/asm-m32r/system.h
index
99ee098
..
f62f5c9
100644
(file)
--- a/
include/asm-m32r/system.h
+++ b/
include/asm-m32r/system.h
@@
-122,8
+122,6
@@
static inline void local_irq_disable(void)
#define xchg(ptr,x) \
((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
#define xchg(ptr,x) \
((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
-
#ifdef CONFIG_SMP
extern void __xchg_called_with_bad_pointer(void);
#endif
#ifdef CONFIG_SMP
extern void __xchg_called_with_bad_pointer(void);
#endif
@@
-138,7
+136,7
@@
extern void __xchg_called_with_bad_pointer(void);
"add3 "reg0", "addr", #0x2000; \n\t" \
"ld "reg0", @"reg0"; \n\t" \
"unlock "reg0", @"reg1"; \n\t"
"add3 "reg0", "addr", #0x2000; \n\t" \
"ld "reg0", @"reg0"; \n\t" \
"unlock "reg0", @"reg1"; \n\t"
- /* FIXME: This workaround code cannot handle ke
nr
el modules
+ /* FIXME: This workaround code cannot handle ke
rn
el modules
* correctly under SMP environment.
*/
#else /* CONFIG_CHIP_M32700_TS1 */
* correctly under SMP environment.
*/
#else /* CONFIG_CHIP_M32700_TS1 */