diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 8f23285cbe3..ef1451cd98e 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.81 1997/04/26 11:45:51 peter Exp $
+ *	$Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $
  */
 
 /*
@@ -102,12 +102,14 @@ int	adjkerntz;		/* local offset	from GMT in seconds */
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
 u_int	idelayed;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 u_int	i586_ctr_bias;
 u_int	i586_ctr_comultiplier;
-u_int	i586_ctr_multiplier;
 #endif
 u_int	i586_ctr_freq;
+#ifndef SMP
+u_int	i586_ctr_multiplier;
+#endif
 #endif
 int	statclock_disable;
 u_int	stat_imask = SWI_CLOCK_MASK;
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 1c3383d0eb6..09971d52f0f 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.25 1997/04/26 11:45:33 peter Exp $
+ *	$Id: clock.h,v 1.26 1997/05/04 14:25:00 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -29,12 +29,14 @@
 extern int	adjkerntz;
 extern int	disable_rtc_set;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 extern u_int	i586_ctr_bias;
 extern u_int	i586_ctr_comultiplier;
-extern u_int	i586_ctr_multiplier;
 #endif
 extern u_int	i586_ctr_freq;
+#ifndef SMP
+extern u_int	i586_ctr_multiplier;
+#endif
 #endif
 extern int	statclock_disable;
 extern u_int	timer_freq;
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 8f23285cbe3..ef1451cd98e 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.81 1997/04/26 11:45:51 peter Exp $
+ *	$Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $
  */
 
 /*
@@ -102,12 +102,14 @@ int	adjkerntz;		/* local offset	from GMT in seconds */
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
 u_int	idelayed;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 u_int	i586_ctr_bias;
 u_int	i586_ctr_comultiplier;
-u_int	i586_ctr_multiplier;
 #endif
 u_int	i586_ctr_freq;
+#ifndef SMP
+u_int	i586_ctr_multiplier;
+#endif
 #endif
 int	statclock_disable;
 u_int	stat_imask = SWI_CLOCK_MASK;
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 8f23285cbe3..ef1451cd98e 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.81 1997/04/26 11:45:51 peter Exp $
+ *	$Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $
  */
 
 /*
@@ -102,12 +102,14 @@ int	adjkerntz;		/* local offset	from GMT in seconds */
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
 u_int	idelayed;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 u_int	i586_ctr_bias;
 u_int	i586_ctr_comultiplier;
-u_int	i586_ctr_multiplier;
 #endif
 u_int	i586_ctr_freq;
+#ifndef SMP
+u_int	i586_ctr_multiplier;
+#endif
 #endif
 int	statclock_disable;
 u_int	stat_imask = SWI_CLOCK_MASK;
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 1c3383d0eb6..09971d52f0f 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.25 1997/04/26 11:45:33 peter Exp $
+ *	$Id: clock.h,v 1.26 1997/05/04 14:25:00 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -29,12 +29,14 @@
 extern int	adjkerntz;
 extern int	disable_rtc_set;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 extern u_int	i586_ctr_bias;
 extern u_int	i586_ctr_comultiplier;
-extern u_int	i586_ctr_multiplier;
 #endif
 extern u_int	i586_ctr_freq;
+#ifndef SMP
+extern u_int	i586_ctr_multiplier;
+#endif
 #endif
 extern int	statclock_disable;
 extern u_int	timer_freq;
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 8f23285cbe3..ef1451cd98e 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.81 1997/04/26 11:45:51 peter Exp $
+ *	$Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $
  */
 
 /*
@@ -102,12 +102,14 @@ int	adjkerntz;		/* local offset	from GMT in seconds */
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
 u_int	idelayed;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 u_int	i586_ctr_bias;
 u_int	i586_ctr_comultiplier;
-u_int	i586_ctr_multiplier;
 #endif
 u_int	i586_ctr_freq;
+#ifndef SMP
+u_int	i586_ctr_multiplier;
+#endif
 #endif
 int	statclock_disable;
 u_int	stat_imask = SWI_CLOCK_MASK;
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 8f23285cbe3..ef1451cd98e 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.81 1997/04/26 11:45:51 peter Exp $
+ *	$Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $
  */
 
 /*
@@ -102,12 +102,14 @@ int	adjkerntz;		/* local offset	from GMT in seconds */
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
 u_int	idelayed;
 #if defined(I586_CPU) || defined(I686_CPU)
-#if !defined(SMP)
+#ifndef SMP
 u_int	i586_ctr_bias;
 u_int	i586_ctr_comultiplier;
-u_int	i586_ctr_multiplier;
 #endif
 u_int	i586_ctr_freq;
+#ifndef SMP
+u_int	i586_ctr_multiplier;
+#endif
 #endif
 int	statclock_disable;
 u_int	stat_imask = SWI_CLOCK_MASK;