From f190f4ad8478ce1d8440faec54025fb19d6bf233 Mon Sep 17 00:00:00 2001 From: Mike Kravetz Date: Mon, 27 Mar 2006 15:20:00 -0800 Subject: [PATCH] --- yaml --- r: 24645 b: refs/heads/master c: 9fe901d124871f5781b9c4ccbb7ff93fdff9d39e h: refs/heads/master i: 24643: 4c17eab8286699c11275f48d9146dd9749671e3f v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ff926280adc..5b5283f0bfe6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78b47a59026f04eb98b9d392901be13b56f444f +refs/heads/master: 9fe901d124871f5781b9c4ccbb7ff93fdff9d39e diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S index 1060155d84c3..19ad5c6b1818 100644 --- a/trunk/arch/powerpc/kernel/entry_64.S +++ b/trunk/arch/powerpc/kernel/entry_64.S @@ -617,6 +617,12 @@ _GLOBAL(enter_rtas) mfsrr1 r10 std r10,_SRR1(r1) + /* Temporary workaround to clear CR until RTAS can be modified to + * ignore all bits. + */ + li r0,0 + mtcr r0 + /* There is no way it is acceptable to get here with interrupts enabled, * check it with the asm equivalent of WARN_ON */