Catch up to new MI astpending and need_resched handling.

3 files changed, 1 insertions, 26 deletions

diff --git a/sys/ia64/ia64/swtch.s b/sys/ia64/ia64/swtch.s
index f523d65..f401746 100644
--- a/sys/ia64/ia64/swtch.s
+++ b/sys/ia64/ia64/swtch.s
@@ -235,9 +235,6 @@ ENTRY(cpu_switch, 0)
 
 1:
 	st8	[r14]=ret0		// set r13->gd_curproc
-	add	r15=@gprel(want_resched),gp
-	;;
-	st4	[r15]=r0		// we've rescheduled
 	mov	ar.k7=ret0
 	mov	r4=ret0			// save from call
 	;; 
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 58cb168..84be440 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -70,8 +70,6 @@
 #include <ddb/ddb.h>
 #endif
 
-u_int32_t want_resched;
-
 static int unaligned_fixup(struct trapframe *framep, struct proc *p);
 
 #ifdef WITNESS
@@ -95,7 +93,7 @@ userret(register struct proc *p, struct trapframe *frame, u_quad_t oticks)
 	}
 	mtx_lock_spin(&sched_lock);
 	p->p_pri.pri_level = p->p_pri.pri_user;
-	if (want_resched) {
+	if (resched_wanted()) {
 		/*
 		 * Since we are curproc, a clock interrupt could
 		 * change our priority without changing run queues
diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h
index 2574266..7a8b02a 100644
--- a/sys/ia64/include/cpu.h
+++ b/sys/ia64/include/cpu.h
@@ -70,14 +70,6 @@ struct clockframe {
 #define	CLKF_INTR(framep)	(curproc->p_intr_nesting_level >= 2)
 
 /*
- * Preempt the current process if in interrupt from user mode,
- * or after the current trap/syscall if in system mode.
- */
-#define	need_resched()		do { want_resched = 1; aston(); } while (0)
-
-#define	resched_wanted()	want_resched
-
-/*
  * Give a profiling tick to the current process when the user profiling
  * buffer pages are invalid.  On the hp300, request an ast to send us
  * through trap, marking the proc as needing a profiling tick.
@@ -89,18 +81,6 @@ struct clockframe {
 	mtx_unlock_spin(&sched_lock);				\
 } while (0)
 
-/*
- * Notify the current process (p) that it has a signal pending,
- * process as soon as possible.
- */
-#define	signotify(p)	aston()
-
-#define	aston()		PCPU_SET(astpending, 1)
-
-#ifdef _KERNEL
-extern u_int32_t want_resched;		/* resched() was called */
-#endif
-
 
 /*
  * CTL_MACHDEP definitions.