diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
commit | 77e442461c74068217b59b356cf18992c78ed896 (patch) | |
tree | 70f62a16bc6a81b63768279c9b40645d8f4dd4ff /arch/powerpc/kernel/head_32.S | |
parent | d54191b85e294c46f05a2249b1f55ae54930bcc7 (diff) | |
parent | 45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff) | |
download | talos-op-linux-77e442461c74068217b59b356cf18992c78ed896.tar.gz talos-op-linux-77e442461c74068217b59b356cf18992c78ed896.zip |
Merge branch 'linus' into x86/kprobes
Diffstat (limited to 'arch/powerpc/kernel/head_32.S')
-rw-r--r-- | arch/powerpc/kernel/head_32.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 785af9b56591..99ee2f0f0f2b 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -421,8 +421,10 @@ BEGIN_FTR_SECTION b ProgramCheck END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE) EXCEPTION_PROLOG - bne load_up_fpu /* if from user, just load it up */ - addi r3,r1,STACK_FRAME_OVERHEAD + beq 1f + bl load_up_fpu /* if from user, just load it up */ + b fast_exception_return +1: addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_EE_LITE(0x800, kernel_fp_unavailable_exception) /* Decrementer */ |