From d682b329fd25630ac783192248442071b4d6f98a Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 15 Mar 2006 12:33:43 +0000 Subject: [PATCH] --- yaml --- r: 22819 b: refs/heads/master c: 5d25ac038a317d454a4321cba955f756400835a5 h: refs/heads/master i: 22817: 64e063bce57e920367a527aa251766d3e5474a2c 22815: 2376e545d9709182e63cce8e3805abc9cab7b165 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/entry-armv.S | 2 +- trunk/arch/arm/vfp/entry.S | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 770ecff8f41c..1a8b547a0f50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f78f10436806660f39440a729acbaf03e3a01023 +refs/heads/master: 5d25ac038a317d454a4321cba955f756400835a5 diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index ec48d70c6d8b..355914ffb192 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -484,7 +484,6 @@ call_fpe: movcss r7, r5, lsr #(TIF_USING_IWMMXT + 1) bcs iwmmxt_task_enable #endif - enable_irq add pc, pc, r8, lsr #6 mov r0, r0 @@ -511,6 +510,7 @@ call_fpe: mov pc, lr @ CP#15 (Control) do_fpe: + enable_irq ldr r4, .LCfp add r10, r10, #TI_FPSTATE @ r10 = workspace ldr pc, [r4] @ Call FP module USR entry point diff --git a/trunk/arch/arm/vfp/entry.S b/trunk/arch/arm/vfp/entry.S index 6f17187ab32a..9ab1abfbe7ad 100644 --- a/trunk/arch/arm/vfp/entry.S +++ b/trunk/arch/arm/vfp/entry.S @@ -22,6 +22,7 @@ .globl do_vfp do_vfp: + enable_irq ldr r4, .LCvfp add r10, r10, #TI_VFPSTATE @ r10 = workspace ldr pc, [r4] @ call VFP entry point