summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2003-02-20 01:57:49 +0000
committergrehan <grehan@FreeBSD.org>2003-02-20 01:57:49 +0000
commit24a98368c57699a34d3b0d1d766d12e10a185509 (patch)
tree728cc0a95bb5a5f0161c74fcba8107447deba265
parent365e5f6c2a3798a216e9f2dcf8b0b349338d8126 (diff)
downloadFreeBSD-src-24a98368c57699a34d3b0d1d766d12e10a185509.zip
FreeBSD-src-24a98368c57699a34d3b0d1d766d12e10a185509.tar.gz
Catch up to latest KSE changes
-rw-r--r--sys/powerpc/aim/trap_subr.S7
-rw-r--r--sys/powerpc/powerpc/trap_subr.S7
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/powerpc/aim/trap_subr.S b/sys/powerpc/aim/trap_subr.S
index e8cf4c6..878f6f4 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 e8cf4c6..878f6f4 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
OpenPOWER on IntegriCloud