From c0bf6c1f26cd0c392e44b72dfd3709b6d7fc75f1 Mon Sep 17 00:00:00 2001 From: Peter Grehan Date: Thu, 20 Feb 2003 01:57:49 +0000 Subject: [PATCH] Catch up to latest KSE changes --- sys/powerpc/aim/trap_subr.S | 7 ++++--- sys/powerpc/powerpc/trap_subr.S | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/aim/trap_subr.S b/sys/powerpc/aim/trap_subr.S index e8cf4c63b0a2..878f6f4cfb16 100644 --- a/sys/powerpc/aim/trap_subr.S +++ b/sys/powerpc/aim/trap_subr.S @@ -690,9 +690,10 @@ CNAME(trapexit): mfsprg 3, 0 /* get per-CPU pointer */ lwz 4, PC_CURTHREAD(3) /* deref to get curthread */ - lwz 3, TD_KSE(4) /* deref to get current KSE */ - lwz 4, KE_FLAGS(3) /* get KSE flags value */ - andi. 4,4,KEF_ASTPENDING|KEF_NEEDRESCHED + lwz 4, TD_FLAGS(3) /* get thread flags value */ + lis 5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@h + oris 5,5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@l + and. 4,4,5 beq 1f mfmsr 3 /* re-enable interrupts */ ori 3,3,PSL_EE@l diff --git a/sys/powerpc/powerpc/trap_subr.S b/sys/powerpc/powerpc/trap_subr.S index e8cf4c63b0a2..878f6f4cfb16 100644 --- a/sys/powerpc/powerpc/trap_subr.S +++ b/sys/powerpc/powerpc/trap_subr.S @@ -690,9 +690,10 @@ CNAME(trapexit): mfsprg 3, 0 /* get per-CPU pointer */ lwz 4, PC_CURTHREAD(3) /* deref to get curthread */ - lwz 3, TD_KSE(4) /* deref to get current KSE */ - lwz 4, KE_FLAGS(3) /* get KSE flags value */ - andi. 4,4,KEF_ASTPENDING|KEF_NEEDRESCHED + lwz 4, TD_FLAGS(3) /* get thread flags value */ + lis 5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@h + oris 5,5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@l + and. 4,4,5 beq 1f mfmsr 3 /* re-enable interrupts */ ori 3,3,PSL_EE@l