From b73fc4e4212d92fbc5ad16a9255f4c7057401ed3 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 3 Feb 2012 00:53:21 +0000 Subject: [PATCH] --- yaml --- r: 298887 b: refs/heads/master c: a5ddea0e78e76aa8d6354b9b0e51e652e21b8137 h: refs/heads/master i: 298885: 03fd24e13fec946c65c3a56b71d9acf5ff8b18a0 298883: f586fa99767a5716b3305e9e493ff4a866cf20a1 298879: 9da4e05cb182941a9d90e8ef31b226a8fe1f8c96 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_hv_interrupts.S | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 190e50dfb579..f76f4b8fa500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4e51229d8a1e499fe65153766437152cca42053 +refs/heads/master: a5ddea0e78e76aa8d6354b9b0e51e652e21b8137 diff --git a/trunk/arch/powerpc/kvm/book3s_hv_interrupts.S b/trunk/arch/powerpc/kvm/book3s_hv_interrupts.S index 3f7b674dd4bf..d3fb4df02c41 100644 --- a/trunk/arch/powerpc/kvm/book3s_hv_interrupts.S +++ b/trunk/arch/powerpc/kvm/book3s_hv_interrupts.S @@ -46,8 +46,10 @@ _GLOBAL(__kvmppc_vcore_entry) /* Save host state to the stack */ stdu r1, -SWITCH_FRAME_SIZE(r1) - /* Save non-volatile registers (r14 - r31) */ + /* Save non-volatile registers (r14 - r31) and CR */ SAVE_NVGPRS(r1) + mfcr r3 + std r3, _CCR(r1) /* Save host DSCR */ BEGIN_FTR_SECTION @@ -157,8 +159,10 @@ kvmppc_handler_highmem: * R13 = PACA */ - /* Restore non-volatile host registers (r14 - r31) */ + /* Restore non-volatile host registers (r14 - r31) and CR */ REST_NVGPRS(r1) + ld r4, _CCR(r1) + mtcr r4 addi r1, r1, SWITCH_FRAME_SIZE ld r0, PPC_LR_STKOFF(r1)