From fa318a12c5d979625c45d8418ea2a02ca4c3fb3c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Feb 2010 11:00:47 +0100 Subject: [PATCH] --- yaml --- r: 197613 b: refs/heads/master c: 964b6411af10fbddc827fdd3887c49f7f5d2bfd3 h: refs/heads/master i: 197611: 8296f2a98b769375f874ad566e07ef61e5884b73 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_64_rmhandlers.S | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 2dd95ab48101..a7437ff1f8db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20a340abd3f7a1ca4d11502ec71d52b4f414326e +refs/heads/master: 964b6411af10fbddc827fdd3887c49f7f5d2bfd3 diff --git a/trunk/arch/powerpc/kvm/book3s_64_rmhandlers.S b/trunk/arch/powerpc/kvm/book3s_64_rmhandlers.S index c83c60ad96c5..bd08535fcdc8 100644 --- a/trunk/arch/powerpc/kvm/book3s_64_rmhandlers.S +++ b/trunk/arch/powerpc/kvm/book3s_64_rmhandlers.S @@ -164,24 +164,15 @@ _GLOBAL(kvmppc_rmcall) #define define_load_up(what) \ \ _GLOBAL(kvmppc_load_up_ ## what); \ - subi r1, r1, INT_FRAME_SIZE; \ + stdu r1, -INT_FRAME_SIZE(r1); \ mflr r3; \ std r3, _LINK(r1); \ - mfmsr r4; \ - std r31, GPR3(r1); \ - mr r31, r4; \ - li r5, MSR_DR; \ - oris r5, r5, MSR_EE@h; \ - andc r4, r4, r5; \ - mtmsr r4; \ \ bl .load_up_ ## what; \ \ - mtmsr r31; \ ld r3, _LINK(r1); \ - ld r31, GPR3(r1); \ - addi r1, r1, INT_FRAME_SIZE; \ mtlr r3; \ + addi r1, r1, INT_FRAME_SIZE; \ blr define_load_up(fpu)