- Convert Alpha over to the new calling conventions for cpu_throw() and

  cpu_switch() where both the old and new threads are passed in as
  arguments.  Only powerpc uses the old conventions now.
- Update comments in the Alpha swtch.s to reflect KSE changes.

Tested by:	obrien, marcel

4 files changed, 5 insertions, 5 deletions

diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 40a2923be8a9..a5a294da7e31 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -1289,7 +1289,7 @@ thread_exit(void)
 	}
 	/* XXX Shouldn't cpu_throw() here. */
 	mtx_assert(&sched_lock, MA_OWNED);
-#if !defined(__alpha__) && !defined(__powerpc__) 
+#if !defined(__powerpc__) 
 	cpu_throw(td, choosethread());
 #else
 	cpu_throw();
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 384feea84000..7525f3a32a7c 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -459,7 +459,7 @@ mi_switch(void)
 {
 	struct bintime new_switchtime;
 	struct thread *td;
-#if !defined(__alpha__) && !defined(__powerpc__)
+#if !defined(__powerpc__)
 	struct thread *newtd;
 #endif
 	struct proc *p;
@@ -517,7 +517,7 @@ mi_switch(void)
 		thread_switchout(td);
 	sched_switchout(td);
 
-#if !defined(__alpha__) && !defined(__powerpc__) 
+#if !defined(__powerpc__) 
 	newtd = choosethread();
 	if (td != newtd)
 		cpu_switch(td, newtd);	/* SHAZAM!! */
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 9f2405751e27..4cb4df4b25db 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -111,7 +111,7 @@ thr_exit1(void)
 	sched_exit_thread(TAILQ_NEXT(td, td_kglist), td);
 	thread_stash(td);
 
-#if !defined(__alpha__) && !defined(__powerpc__) 
+#if !defined(__powerpc__) 
 	cpu_throw(td, choosethread());
 #else
 	cpu_throw();
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 40a2923be8a9..a5a294da7e31 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -1289,7 +1289,7 @@ thread_exit(void)
 	}
 	/* XXX Shouldn't cpu_throw() here. */
 	mtx_assert(&sched_lock, MA_OWNED);
-#if !defined(__alpha__) && !defined(__powerpc__) 
+#if !defined(__powerpc__) 
 	cpu_throw(td, choosethread());
 #else
 	cpu_throw();