4 files changed, 1 insertions, 25 deletions

diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 18822b87cc5b..d35b94077130 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -62,21 +62,6 @@
 	((ISPL((framep)->cf_cs) == SEL_UPL) || (framep->cf_eflags & PSL_VM))
 
 #define CLKF_INTR(framep)	(intr_nesting_level >= 2)
-#if 0
-/*
- * XXX splsoftclock() is very broken and barely worth fixing.  It doesn't
- * turn off the clock bit in imen or in the icu.  (This is not a serious
- * problem at 100 Hz but it is serious at 16000 Hz for pcaudio.  softclock()
- * can take more than 62.5 usec so clock interrupts are lost.)  It doesn't
- * check for pending interrupts being unmasked.  clkintr() and Xintr0()
- * assume that the ipl is high when hardclock() returns.  Our SWI_CLOCK
- * handling is efficient enough that little is gained by calling
- * softclock() directly.
- */
-#define	CLKF_BASEPRI(framep)	((framep)->cf_ppl == 0)
-#else
-#define	CLKF_BASEPRI(framep)	(0)
-#endif
 #define	CLKF_PC(framep)		((framep)->cf_eip)
 
 /*
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index ea9aee8ddbcd..5ef95b3607a7 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -1900,11 +1900,6 @@ struct simplelock	mcount_lock;
 struct simplelock	com_lock;
 #endif /* USE_COMLOCK */
 
-#ifdef USE_CLOCKLOCK
-/* lock regions around the clock hardware */
-struct simplelock	clock_lock;
-#endif /* USE_CLOCKLOCK */
-
 /* lock around the MP rendezvous */
 static struct simplelock smp_rv_lock;
 
@@ -1930,9 +1925,6 @@ init_locks(void)
 #ifdef USE_COMLOCK
 	s_lock_init((struct simplelock*)&com_lock);
 #endif /* USE_COMLOCK */
-#ifdef USE_CLOCKLOCK
-	s_lock_init((struct simplelock*)&clock_lock);
-#endif /* USE_CLOCKLOCK */
 
 	s_lock_init(&ap_boot_lock);
 }
@@ -2425,7 +2417,6 @@ ap_init(void)
 	 * something unique to lock with.
 	 */
 	PCPU_SET(curproc,idleproc);
-	PCPU_SET(prevproc,idleproc);
 
 	microuptime(&switchtime);
 	switchticks = ticks;
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index ca518d98fd44..881cbfae3c72 100644
--- a/sys/amd64/include/mutex.h
+++ b/sys/amd64/include/mutex.h
@@ -146,6 +146,7 @@ void	_mtx_exit(struct mtx *mtxp, int type, const char *file, int line);
 /* Global locks */
 extern struct mtx	sched_lock;
 extern struct mtx	Giant;
+extern struct mtx	clock_lock;
 
 /*
  * Used to replace return with an exit Giant and return.
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index ace3602a2844..27884997a535 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -55,7 +55,6 @@
 struct globaldata {
 	struct privatespace *gd_prvspace;	/* self-reference */
 	struct proc	*gd_curproc;
-	struct proc	*gd_prevproc;
 	struct proc	*gd_npxproc;
 	struct pcb	*gd_curpcb;
 	struct proc	*gd_idleproc;