Index: cpu.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/cpu.c,v
retrieving revision 1.67
diff -u -p -r1.67 cpu.c
--- cpu.c	3 Dec 2017 10:55:50 -0000	1.67
+++ cpu.c	10 Dec 2017 23:37:43 -0000
@@ -197,6 +197,7 @@ cpu_match(parent, vcf, aux)
 	void *vcf;
 	void *aux;
 {
+        struct cfdata *cf = vcf;
 	struct mainbus_attach_args *ma = aux;
 #ifndef MULTIPROCESSOR
 	int portid;
@@ -205,6 +206,9 @@ cpu_match(parent, vcf, aux)
 
 	if (OF_getprop(ma->ma_node, "device_type", buf, sizeof(buf)) <= 0 ||
 	    strcmp(buf, "cpu") != 0)
+		return (0);
+
+	if (cf->cf_unit >= MAXCPUS)
 		return (0);
 
 #ifndef MULTIPROCESSOR