Move a bunch of flags from the KSE to the thread.

I was in two minds as to where to put them in the first case..
I should have listenned to the other mind.

Submitted by:	 parts by davidxu@
Reviewed by:	jeff@ mini@

3 files changed, 11 insertions, 16 deletions

diff --git a/sys/ia64/ia64/exception.S b/sys/ia64/ia64/exception.S
index f4f4c9f..5a62da0 100644
--- a/sys/ia64/ia64/exception.S
+++ b/sys/ia64/ia64/exception.S
@@ -831,26 +831,24 @@ ENTRY(exception_restore, 0)
 	add	r3=PC_CURTHREAD,r13	// &curthread
 	;;
 	ld8	r3=[r3]			// curthread
-	add	r2=(KEF_ASTPENDING|KEF_NEEDRESCHED),r0
+	add	r2=(TDF_ASTPENDING|TDF_NEEDRESCHED),r0
 	;;
 }
 {	.mmb
-	add	r3=TD_KSE,r3		// &curthread->td_kse
 	mov	r15=psr			// save interrupt enable status
 	nop	4
 	;;
 }
 {	.mmi
-	ld8	r3=[r3]			// curkse
 	;;
 	rsm	psr.i			// disable interrupts
-	add	r3=KE_FLAGS,r3		// &curkse->ke_flags
+	add	r3=TD_FLAGS,r3		// &curthread->td_flags
 	;;
 }
 {	.mmi
-	ld4	r14=[r3]		// fetch curkse->ke_flags
+	ld4	r14=[r3]		// fetch curthread->td_flags
 	;;
-	and	r14=r2,r14	    // flags & (KEF_ASTPENDING|KEF_NEEDRESCHED)
+	and	r14=r2,r14	    // flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)
 	nop	5
 	;;
 }
diff --git a/sys/ia64/ia64/exception.s b/sys/ia64/ia64/exception.s
index f4f4c9f..5a62da0 100644
--- a/sys/ia64/ia64/exception.s
+++ b/sys/ia64/ia64/exception.s
@@ -831,26 +831,24 @@ ENTRY(exception_restore, 0)
 	add	r3=PC_CURTHREAD,r13	// &curthread
 	;;
 	ld8	r3=[r3]			// curthread
-	add	r2=(KEF_ASTPENDING|KEF_NEEDRESCHED),r0
+	add	r2=(TDF_ASTPENDING|TDF_NEEDRESCHED),r0
 	;;
 }
 {	.mmb
-	add	r3=TD_KSE,r3		// &curthread->td_kse
 	mov	r15=psr			// save interrupt enable status
 	nop	4
 	;;
 }
 {	.mmi
-	ld8	r3=[r3]			// curkse
 	;;
 	rsm	psr.i			// disable interrupts
-	add	r3=KE_FLAGS,r3		// &curkse->ke_flags
+	add	r3=TD_FLAGS,r3		// &curthread->td_flags
 	;;
 }
 {	.mmi
-	ld4	r14=[r3]		// fetch curkse->ke_flags
+	ld4	r14=[r3]		// fetch curthread->td_flags
 	;;
-	and	r14=r2,r14	    // flags & (KEF_ASTPENDING|KEF_NEEDRESCHED)
+	and	r14=r2,r14	    // flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)
 	nop	5
 	;;
 }
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 4aa349f..158b388 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -82,14 +82,13 @@ ASSYM(MTX_UNOWNED,	MTX_UNOWNED);
 
 ASSYM(TD_PROC,		offsetof(struct thread, td_proc));
 ASSYM(TD_PCB,		offsetof(struct thread, td_pcb));
-ASSYM(TD_KSE,		offsetof(struct thread, td_kse));
 ASSYM(TD_KSTACK,	offsetof(struct thread, td_kstack));
 ASSYM(TD_MD_FLAGS,	offsetof(struct thread, td_md.md_flags));
 
-ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags));
+ASSYM(TD_FLAGS, offsetof(struct thread, td_flags));
 
-ASSYM(KEF_ASTPENDING, KEF_ASTPENDING);
-ASSYM(KEF_NEEDRESCHED, KEF_NEEDRESCHED);
+ASSYM(TDF_ASTPENDING, TDF_ASTPENDING);
+ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
 
 ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS);