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 branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
system.h
diff --git
a/arch/arm/include/asm/system.h
b/arch/arm/include/asm/system.h
index
97f6d60
..
9a87823
100644
(file)
--- a/
arch/arm/include/asm/system.h
+++ b/
arch/arm/include/asm/system.h
@@
-347,6
+347,7
@@
void cpu_idle_wait(void);
#include <asm-generic/cmpxchg-local.h>
#if __LINUX_ARM_ARCH__ < 6
#include <asm-generic/cmpxchg-local.h>
#if __LINUX_ARM_ARCH__ < 6
+/* min ARCH < ARMv6 */
#ifdef CONFIG_SMP
#error "SMP is not supported on this platform"
#ifdef CONFIG_SMP
#error "SMP is not supported on this platform"
@@
-365,7
+366,7
@@
void cpu_idle_wait(void);
#include <asm-generic/cmpxchg.h>
#endif
#include <asm-generic/cmpxchg.h>
#endif
-#else /*
__LINUX_ARM_ARCH__ >=
6 */
+#else /*
min ARCH >= ARMv
6 */
extern void __bad_cmpxchg(volatile void *ptr, int size);
extern void __bad_cmpxchg(volatile void *ptr, int size);
@@
-379,7
+380,7
@@
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
unsigned long oldval, res;
switch (size) {
unsigned long oldval, res;
switch (size) {
-#if
def CONFIG_CPU_32v6K
+#if
ndef CONFIG_CPU_V6 /* min ARCH >= ARMv6K */
case 1:
do {
asm volatile("@ __cmpxchg1\n"
case 1:
do {
asm volatile("@ __cmpxchg1\n"
@@
-404,7
+405,7
@@
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
: "memory", "cc");
} while (res);
break;
: "memory", "cc");
} while (res);
break;
-#endif
/* CONFIG_CPU_32v6K */
+#endif
case 4:
do {
asm volatile("@ __cmpxchg4\n"
case 4:
do {
asm volatile("@ __cmpxchg4\n"
@@
-450,12
+451,12
@@
static inline unsigned long __cmpxchg_local(volatile void *ptr,
unsigned long ret;
switch (size) {
unsigned long ret;
switch (size) {
-#if
ndef CONFIG_CPU_32v6K
+#if
def CONFIG_CPU_V6 /* min ARCH == ARMv6 */
case 1:
case 2:
ret = __cmpxchg_local_generic(ptr, old, new, size);
break;
case 1:
case 2:
ret = __cmpxchg_local_generic(ptr, old, new, size);
break;
-#endif
/* !CONFIG_CPU_32v6K */
+#endif
default:
ret = __cmpxchg(ptr, old, new, size);
}
default:
ret = __cmpxchg(ptr, old, new, size);
}
@@
-469,7
+470,7
@@
static inline unsigned long __cmpxchg_local(volatile void *ptr,
(unsigned long)(n), \
sizeof(*(ptr))))
(unsigned long)(n), \
sizeof(*(ptr))))
-#if
def CONFIG_CPU_32v6K
+#if
ndef CONFIG_CPU_V6 /* min ARCH >= ARMv6K */
/*
* Note : ARMv7-M (currently unsupported by Linux) does not support
/*
* Note : ARMv7-M (currently unsupported by Linux) does not support
@@
-524,11
+525,11
@@
static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
(unsigned long long)(o), \
(unsigned long long)(n)))
(unsigned long long)(o), \
(unsigned long long)(n)))
-#else
/* !CONFIG_CPU_32v6K
*/
+#else
/* min ARCH = ARMv6
*/
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#endif
/* CONFIG_CPU_32v6K */
+#endif
#endif /* __LINUX_ARM_ARCH__ >= 6 */
#endif /* __LINUX_ARM_ARCH__ >= 6 */