Move MAXCPU from machine/smp.h to machine/param.h to fix breakage

with !SMP kernels.  Also, replace NCPUS with MAXCPU since they are
redundant.

3 files changed, 5 insertions, 5 deletions

diff --git a/sys/alpha/include/lock.h b/sys/alpha/include/lock.h
index 1066d46..f2e3448 100644
--- a/sys/alpha/include/lock.h
+++ b/sys/alpha/include/lock.h
@@ -55,7 +55,7 @@ s_unlock(struct simplelock *lkp)
 	lkp->lock_data = 0;
 }
 
-#if !defined(SIMPLELOCK_DEBUG) && NCPUS > 1
+#if !defined(SIMPLELOCK_DEBUG) && MAXCPU > 1
 /*
  * This set of defines turns on the real functions in i386/isa/apic_ipl.s.
  */
@@ -64,7 +64,7 @@ s_unlock(struct simplelock *lkp)
 #define	simple_lock_try(alp)	s_lock_try(alp)
 #define	simple_unlock(alp)	s_unlock(alp)
 
-#endif /* !SIMPLELOCK_DEBUG && NCPUS > 1 */
+#endif /* !SIMPLELOCK_DEBUG && MAXCPU > 1 */
 
 #define COM_LOCK()
 #define COM_UNLOCK()
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index a845737..28bef01 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -71,9 +71,9 @@
 #define OBJFORMAT_DEFAULT	"elf"
 
 #ifdef SMP
-#define NCPUS		32
+#define MAXCPU		32
 #else
-#define NCPUS		1
+#define MAXCPU		1
 #endif
 
 /*
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index de59b66..886627c 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -178,7 +178,7 @@ struct pmap {
 	struct {
 		u_int32_t	asn:8;		/* address space number */
 		u_int32_t	gen:24;		/* generation number */
-	}			pm_asn[NCPUS];
+	}			pm_asn[MAXCPU];
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	struct	vm_page		*pm_ptphint;	/* pmap ptp hint */
 };