aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/system.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-08 15:24:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-08 15:24:46 -0400
commitd15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch)
treed4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /include/asm-arm/system.h
parentb53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff)
parent1def630a6a49dda5bc89dfbd86656293640456f0 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/system.h')
-rw-r--r--include/asm-arm/system.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 95b3abf4851b..7c9568d30307 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -127,6 +127,12 @@ static inline int cpu_is_xsc3(void)
127} 127}
128#endif 128#endif
129 129
130#if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3)
131#define cpu_is_xscale() 0
132#else
133#define cpu_is_xscale() 1
134#endif
135
130#define set_cr(x) \ 136#define set_cr(x) \
131 __asm__ __volatile__( \ 137 __asm__ __volatile__( \
132 "mcr p15, 0, %0, c1, c0, 0 @ set CR" \ 138 "mcr p15, 0, %0, c1, c0, 0 @ set CR" \