aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-armv.S
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-07-01 14:56:48 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-01 14:56:48 -0400
commitae95bfbb2b67eba5d67a0478a8715682a87e2616 (patch)
tree39441dab1f8934f0596bfaef267994aefb266921 /arch/arm/kernel/entry-armv.S
parent9b8417556cca8d56467fd47a39667a4cf3ae21f3 (diff)
[ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure
Patch from Lennert Buytenhek This patch makes the iWMMXt context switch hook use the generic thread notifier infrastructure that was recently merged in commit d6551e884cf66de072b81f8b6d23259462c40baf. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
-rw-r--r--arch/arm/kernel/entry-armv.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 6423a38839b8..0e8aeaf9ff1d 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -590,9 +590,7 @@ ENTRY(__switch_to)
590#ifdef CONFIG_MMU 590#ifdef CONFIG_MMU
591 mcr p15, 0, r6, c3, c0, 0 @ Set domain register 591 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
592#endif 592#endif
593#if defined(CONFIG_IWMMXT) 593#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
594 bl iwmmxt_task_switch
595#elif defined(CONFIG_CPU_XSCALE)
596 add r4, r2, #TI_CPU_DOMAIN + 40 @ cpu_context_save->extra 594 add r4, r2, #TI_CPU_DOMAIN + 40 @ cpu_context_save->extra
597 ldmib r4, {r4, r5} 595 ldmib r4, {r4, r5}
598 mar acc0, r4, r5 596 mar acc0, r4, r5