diff --git a/sys/kern/subr_cpu_topology.c b/sys/kern/subr_cpu_topology.c
--- a/sys/kern/subr_cpu_topology.c
+++ b/sys/kern/subr_cpu_topology.c
@@ -94,9 +94,8 @@
 	int next_apicid = curr_apicid;
 	do {
 		next_apicid++;
-	}
-	while(get_cpuid_from_apicid(next_apicid) == -1 &&
-	   next_apicid < NAPICID);
+	} while (next_apicid < NAPICID &&
+	   get_cpuid_from_apicid(next_apicid) == -1);
 	if (next_apicid == NAPICID) {
 		kprintf("Warning: No next valid APICID found. Returning -1\n");
 		return -1;