aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-06-23 02:04:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:42:55 -0700
commit7f788435568795c4cd29301bb4ccf7aff54f5051 (patch)
tree664b5c222a42da3b44da6b11c18cccc6e13425ce /include
parent[PATCH] frv: initrd is grossly broken on frv (never built) (diff)
downloadlinux-dev-7f788435568795c4cd29301bb4ccf7aff54f5051.tar.xz
linux-dev-7f788435568795c4cd29301bb4ccf7aff54f5051.zip
[PATCH] frv: NULL noise removal in frv xchg()
Clean up the FRV arch's xchg() function. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-frv/atomic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
index 9a4ff03c3969..066386ac238e 100644
--- a/include/asm-frv/atomic.h
+++ b/include/asm-frv/atomic.h
@@ -227,7 +227,7 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig
break; \
\
default: \
- __xg_orig = 0; \
+ __xg_orig = (__typeof__(__xg_orig))0; \
asm volatile("break"); \
break; \
} \
@@ -247,7 +247,7 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
switch (sizeof(__xg_orig)) { \
case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr); break; \
default: \
- __xg_orig = 0; \
+ __xg_orig = (__typeof__(__xg_orig))0; \
asm volatile("break"); \
break; \
} \