From 95dd336df2cd7c8e21cf22b9141b6966d9fe8c43 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sun, 7 Feb 2010 19:37:29 +0000 Subject: [PATCH] --- yaml --- r: 181893 b: refs/heads/master c: 44c9f3cc1a07503b653b571eac5792436da39a30 h: refs/heads/master i: 181891: 52c4a97625006456bbd8e9efcee0501541faece5 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54e8875ff57c..162ee0d5bd00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8354be9c104db8e92bb079e29540fbafb7f09b5c +refs/heads/master: 44c9f3cc1a07503b653b571eac5792436da39a30 diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S index bdcb557d470a..07109d843787 100644 --- a/trunk/arch/powerpc/kernel/entry_64.S +++ b/trunk/arch/powerpc/kernel/entry_64.S @@ -791,9 +791,8 @@ _GLOBAL(enter_rtas) li r9,1 rldicr r9,r9,MSR_SF_LG,(63-MSR_SF_LG) - ori r9,r9,MSR_IR|MSR_DR|MSR_FE0|MSR_FE1|MSR_FP + ori r9,r9,MSR_IR|MSR_DR|MSR_FE0|MSR_FE1|MSR_FP|MSR_RI andc r6,r0,r9 - ori r6,r6,MSR_RI sync /* disable interrupts so SRR0/1 */ mtmsrd r0 /* don't get trashed */