diff --git a/sys/common/pmap/tlb/pmap_segtab.c b/sys/common/pmap/tlb/pmap_segtab.c
index d9d079d8e128..39e6877ec3a8 100644
--- a/sys/common/pmap/tlb/pmap_segtab.c
+++ b/sys/common/pmap/tlb/pmap_segtab.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_segtab.c,v 1.3 2011/06/21 06:43:38 matt Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.3 2011/06/21 06:43:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $");
 
 /*
  *	Manages physical address maps.
@@ -97,6 +97,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.3 2011/06/21 06:43:38 matt Exp $")
 
 #define __PMAP_PRIVATE
 
+#include "opt_multiprocessor.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/common/pmap/tlb/pmap_synci.c b/sys/common/pmap/tlb/pmap_synci.c
index bad42bdf25c5..cfeec5f92694 100644
--- a/sys/common/pmap/tlb/pmap_synci.c
+++ b/sys/common/pmap/tlb/pmap_synci.c
@@ -29,10 +29,12 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_synci.c,v 1.1 2011/06/23 07:43:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_synci.c,v 1.2 2011/06/23 08:11:56 matt Exp $");
 
 #define __PMAP_PRIVATE
 
+#include "opt_multiprocessor.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
diff --git a/sys/common/pmap/tlb/pmap_tlb.c b/sys/common/pmap/tlb/pmap_tlb.c
index eae232e10119..61d613a6c1c8 100644
--- a/sys/common/pmap/tlb/pmap_tlb.c
+++ b/sys/common/pmap/tlb/pmap_tlb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_tlb.c,v 1.8 2011/06/23 07:58:19 matt Exp $	*/
+/*	$NetBSD: pmap_tlb.c,v 1.9 2011/06/23 08:11:56 matt Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.8 2011/06/23 07:58:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.9 2011/06/23 08:11:56 matt Exp $");
 
 /*
  * Manages address spaces in a TLB.
@@ -124,6 +124,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.8 2011/06/23 07:58:19 matt Exp $");
 
 #define __PMAP_PRIVATE
 
+#include "opt_multiprocessor.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -415,7 +417,7 @@ pmap_tlb_asid_reinitialize(struct pmap_tlb_info *ti, enum tlb_invalidate_op op)
 		KASSERT(pm != pmap_kernel());
 		KASSERT(pai->pai_asid > KERNEL_PID);
 #if defined(MULTIPROCESSOR)
-		if (!CPUSET_EMPTY_P(CPUSET_SUBSET(pm->pm_onproc, ti->ti_cpu_mask)) {
+		if (!CPUSET_EMPTY_P(CPUSET_SUBSET(pm->pm_onproc, ti->ti_cpu_mask))) {
 			if (!TLBINFO_ASID_INUSE_P(ti, pai->pai_asid)) {
 				TLBINFO_ASID_MARK_USED(ti, pai->pai_asid);
 				ti->ti_asids_free--;