git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
cmpxchg.h
diff --git
a/arch/s390/include/asm/cmpxchg.h
b/arch/s390/include/asm/cmpxchg.h
index
7488e52
..
81d7908
100644
(file)
--- a/
arch/s390/include/asm/cmpxchg.h
+++ b/
arch/s390/include/asm/cmpxchg.h
@@
-167,7
+167,6
@@
static inline unsigned long __cmpxchg(void *ptr, unsigned long old,
#ifdef CONFIG_64BIT
#define cmpxchg64(ptr, o, n) \
({ \
#ifdef CONFIG_64BIT
#define cmpxchg64(ptr, o, n) \
({ \
- BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
cmpxchg((ptr), (o), (n)); \
})
#else /* CONFIG_64BIT */
cmpxchg((ptr), (o), (n)); \
})
#else /* CONFIG_64BIT */