From 63cba9b87c7f51af8b87c761efbcb022e2aa8632 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 5 Mar 2012 10:55:04 +1100 Subject: [PATCH] --- yaml --- r: 292509 b: refs/heads/master c: 9424fabf8617c15e18a5ffd29bc3bcfa36620473 h: refs/heads/master i: 292507: 893d533388b1e10297a9ced080f3483974126cc0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/exceptions-64e.S | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b6ccfc090afb..c5f8cf676aa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 990118c84b3e90b2b5354b6e2acd961044d7fa12 +refs/heads/master: 9424fabf8617c15e18a5ffd29bc3bcfa36620473 diff --git a/trunk/arch/powerpc/kernel/exceptions-64e.S b/trunk/arch/powerpc/kernel/exceptions-64e.S index 3de9993c5c65..c4c34665c221 100644 --- a/trunk/arch/powerpc/kernel/exceptions-64e.S +++ b/trunk/arch/powerpc/kernel/exceptions-64e.S @@ -353,15 +353,16 @@ interrupt_end_book3e: NORMAL_EXCEPTION_PROLOG(0x800, PROLOG_ADDITION_NONE) /* we can probably do a shorter exception entry for that one... */ EXCEPTION_COMMON(0x800, PACA_EXGEN, INTS_KEEP) - bne 1f /* if from user, just load it up */ - INTS_DISABLE_ALL + ld r12,_MSR(r1) + andi. r0,r12,MSR_PR; + beq- 1f + bl .load_up_fpu + b fast_exception_return +1: INTS_DISABLE_ALL bl .save_nvgprs addi r3,r1,STACK_FRAME_OVERHEAD bl .kernel_fp_unavailable_exception - BUG_OPCODE -1: ld r12,_MSR(r1) - bl .load_up_fpu - b fast_exception_return + b .ret_from_except /* Decrementer Interrupt */ MASKABLE_EXCEPTION(0x900, decrementer, .timer_interrupt, ACK_DEC)