Module: xenomai-gch
Branch: for-forge
Commit: 6ca967023d0f36941d1648777dbf03d819c8fbbb
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=6ca967023d0f36941d1648777dbf03d819c8fbbb
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Fri Apr 25 21:29:26 2014 +0200
cobalt/arm: fix context switch for 3.11+
---
kernel/cobalt/arch/arm/switch.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/cobalt/arch/arm/switch.S b/kernel/cobalt/arch/arm/switch.S
index 5a4ecbc..6258a15 100644
--- a/kernel/cobalt/arch/arm/switch.S
+++ b/kernel/cobalt/arch/arm/switch.S
@@ -141,11 +141,11 @@ ENTRY(__asm_thread_switch)
THUMB( stmia ip!, {r4 - sl, fp} ) @ Store most regs on
stack
THUMB( str sp, [ip], #4 )
THUMB( str lr, [ip], #4 )
- load_tls r2, r4, r5
+ load_tls r1, r4, r5
#ifdef CONFIG_CPU_USE_DOMAINS
ldr r6, [r1, #TI_CPU_DOMAIN]
#endif
- switch_tls r1, r4, r5, r3, r7
+ switch_tls r0, r4, r5, r3, r7
#ifdef CONFIG_CPU_USE_DOMAINS
mcr p15, 0, r6, c3, c0, 0 @ Set domain register
#endif
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
