From e097cdf3a76c088342eb22c629104eca6991808a Mon Sep 17 00:00:00 2001 From: Francois Wellenrieter Date: Fri, 13 Jan 2006 14:01:01 -0800 Subject: [PATCH] --- yaml --- r: 18359 b: refs/heads/master c: 8a4b7b6f187f2967bff222e8c3758ab47efdb14f h: refs/heads/master i: 18357: a2f262816fb83ea300554573c9a0aeffb037296d 18355: b39d5cad3c78a4b14293cfbd5561040b3df378c4 18351: 70cfaa2eca1b9447320338fad17aa1b1511d45d1 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/mca_asm.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f13c58a1a585..e58bb83a55dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9335d48e10d2d07eacaddf889ec1efb8a5a5082e +refs/heads/master: 8a4b7b6f187f2967bff222e8c3758ab47efdb14f diff --git a/trunk/arch/ia64/kernel/mca_asm.S b/trunk/arch/ia64/kernel/mca_asm.S index db32fc1d3935..403a80a58c13 100644 --- a/trunk/arch/ia64/kernel/mca_asm.S +++ b/trunk/arch/ia64/kernel/mca_asm.S @@ -847,7 +847,7 @@ ia64_state_restore: ;; mov cr.iim=temp3 mov cr.iha=temp4 - dep r22=0,r22,62,2 // pal_min_state, physical, uncached + dep r22=0,r22,62,1 // pal_min_state, physical, uncached mov IA64_KR(CURRENT)=r21 ld8 r8=[temp1] // os_status ld8 r10=[temp2] // context