From 460160e15e58c2a019cea2da29252f6c93b828f5 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 2 Mar 2012 11:01:31 +1100 Subject: [PATCH] --- yaml --- r: 292508 b: refs/heads/master c: 990118c84b3e90b2b5354b6e2acd961044d7fa12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/ppc_asm.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8e9e40bf2c83..b6ccfc090afb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ac21cd465391802d931bd5e692302639383b8f5 +refs/heads/master: 990118c84b3e90b2b5354b6e2acd961044d7fa12 diff --git a/trunk/arch/powerpc/include/asm/ppc_asm.h b/trunk/arch/powerpc/include/asm/ppc_asm.h index 368f72f79808..50f73aa2ba21 100644 --- a/trunk/arch/powerpc/include/asm/ppc_asm.h +++ b/trunk/arch/powerpc/include/asm/ppc_asm.h @@ -60,6 +60,8 @@ BEGIN_FW_FTR_SECTION; \ cmpd cr1,r11,r10; \ beq+ cr1,33f; \ bl .accumulate_stolen_time; \ + ld r12,_MSR(r1); \ + andi. r10,r12,MSR_PR; /* Restore cr0 (coming from user) */ \ 33: \ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)