aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2012-12-11 01:26:23 +0400
committerChris Zankel <chris@zankel.net>2012-12-18 21:10:25 -0800
commiteab5e7a79d1bb3d607dabf022bfad9f46d1e3ac8 (patch)
tree9b6c38cd910670a3ba9edb6ea9b9f572763a5c9b
parentxtensa: reset all timers on initialization (diff)
downloadlinux-dev-eab5e7a79d1bb3d607dabf022bfad9f46d1e3ac8.tar.xz
linux-dev-eab5e7a79d1bb3d607dabf022bfad9f46d1e3ac8.zip
xtensa: initialize CPENABLE SR when core has one
XCHAL_CP_NUM is defined in variant/tie.h and it is not included by head.S, leaving CPENABLE register uninitialised. XCHAL_HAVE_CP is defined in variant/core.h to 1 when core has CPENABLE SR. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r--arch/xtensa/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index 0cd337a341d9..91d9095284de 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -124,7 +124,7 @@ ENTRY(_startup)
/* Disable coprocessors. */
-#if XCHAL_CP_NUM > 0
+#if XCHAL_HAVE_CP
wsr a0, cpenable
#endif