diff --git a/sys/arch/sbmips/include/pmap.h b/sys/arch/sbmips/include/pmap.h
index b0a50fe59c90..e0b2f695f69a 100644
--- a/sys/arch/sbmips/include/pmap.h
+++ b/sys/arch/sbmips/include/pmap.h
@@ -1,10 +1,10 @@
-/* $NetBSD: pmap.h,v 1.1 2002/03/06 02:13:46 simonb Exp $ */
+/* $NetBSD: pmap.h,v 1.2 2007/02/22 16:55:22 thorpej Exp $ */
 
 #include <mips/pmap.h>
 
 /* uncached accesses are bad; all accesses should be cached (and coherent) */
 #undef PMAP_PAGEIDLEZERO
-#define	PMAP_PAGEIDLEZERO(pa)   (pmap_zero_page(pa), TRUE)
+#define	PMAP_PAGEIDLEZERO(pa)   (pmap_zero_page(pa), true)
 
 int sbmips_cca_for_pa(paddr_t);
 
diff --git a/sys/arch/sbmips/sbmips/machdep.c b/sys/arch/sbmips/sbmips/machdep.c
index 4323e5747533..1feaad2757c0 100644
--- a/sys/arch/sbmips/sbmips/machdep.c
+++ b/sys/arch/sbmips/sbmips/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.31 2007/02/09 21:55:11 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.32 2007/02/22 16:55:22 thorpej Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2007/02/09 21:55:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2007/02/22 16:55:22 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -365,12 +365,12 @@ cpu_startup(void)
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, 16 * NCARGS,
-	    VM_MAP_PAGEABLE, FALSE, NULL);
+	    VM_MAP_PAGEABLE, false, NULL);
 	/*
 	 * Allocate a submap for physio.
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, VM_PHYS_SIZE,
-	    0, FALSE, NULL);
+	    0, false, NULL);
 
 
 	/*
diff --git a/sys/arch/sgimips/gio/gio.c b/sys/arch/sgimips/gio/gio.c
index 7f8213a7a8d2..941cc8fae397 100644
--- a/sys/arch/sgimips/gio/gio.c
+++ b/sys/arch/sgimips/gio/gio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gio.c,v 1.28 2007/02/21 22:59:50 thorpej Exp $	*/
+/*	$NetBSD: gio.c,v 1.29 2007/02/22 16:54:26 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.28 2007/02/21 22:59:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.29 2007/02/22 16:54:26 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -234,7 +234,7 @@ gio_attach(struct device *parent, struct device *self, void *aux)
 	 * already been attached.
 	 */
 	for (i = 0; slot_bases[i].base != 0; i++) {
-		bool skip = FALSE;
+		bool skip = false;
 
 		/* skip slots that don't apply to us */
 		if (slot_bases[i].mach_type != mach_type)
@@ -246,7 +246,7 @@ gio_attach(struct device *parent, struct device *self, void *aux)
 
 		for (j = 0; j < ngfx; j++) {
 			if (slot_bases[i].base == gfx[j]) {
-				skip = TRUE;
+				skip = true;
 				break;
 			}
 		}
diff --git a/sys/arch/sgimips/sgimips/autoconf.c b/sys/arch/sgimips/sgimips/autoconf.c
index 71888488f304..2a0bba3cd355 100644
--- a/sys/arch/sgimips/sgimips/autoconf.c
+++ b/sys/arch/sgimips/sgimips/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.34 2006/12/24 02:05:55 rumble Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.35 2007/02/22 16:54:26 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.34 2006/12/24 02:05:55 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.35 2007/02/22 16:54:26 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -192,12 +192,12 @@ device_register(struct device *dev, void *aux)
 		struct pci_attach_args *pa = aux;
 
 		if (BUILTIN_AHC_P(pa)) {
-			prop_bool_t usetd = prop_bool_create(TRUE);
+			prop_bool_t usetd = prop_bool_create(true);
 			KASSERT(usetd != NULL);
 
 			if (prop_dictionary_set(device_properties(dev),
 						"aic7xxx-use-target-defaults",
-						usetd) == FALSE) {
+						usetd) == false) {
 				printf("WARNING: unable to set "
 				    "aic7xxx-use-target-defaults property "
 				    "for %s\n", dev->dv_xname);
@@ -220,7 +220,7 @@ device_register(struct device *dev, void *aux)
 			KASSERT(gfe_boundary != NULL);
 
 			if (prop_dictionary_set(device_properties(dev),
-			    "tl-dma-page-boundary", gfe_boundary) == FALSE) {
+			    "tl-dma-page-boundary", gfe_boundary) == false) {
 				printf("WARNING: unable to set "
 				    "tl-dma-page-boundary property "
 				    "for %s\n", dev->dv_xname);
diff --git a/sys/arch/sgimips/sgimips/machdep.c b/sys/arch/sgimips/sgimips/machdep.c
index 85e2883ce305..7c674b344b2f 100644
--- a/sys/arch/sgimips/sgimips/machdep.c
+++ b/sys/arch/sgimips/sgimips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.107 2007/02/21 04:27:10 rumble Exp $	*/
+/*	$NetBSD: machdep.c,v 1.108 2007/02/22 16:54:26 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2007/02/21 04:27:10 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2007/02/22 16:54:26 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -660,12 +660,12 @@ cpu_startup()
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				    16 * NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				    16 * NCARGS, VM_MAP_PAGEABLE, false, NULL);
 	/*
 	 * Allocate a submap for physio.
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				    VM_PHYS_SIZE, 0, FALSE, NULL);
+				    VM_PHYS_SIZE, 0, false, NULL);
 
 	/*
 	 * (No need to allocate an mbuf cluster submap.  Mbuf clusters
diff --git a/sys/arch/sh3/sh3/db_interface.c b/sys/arch/sh3/sh3/db_interface.c
index 131dfd60a3e6..4ae3f7559ee4 100644
--- a/sys/arch/sh3/sh3/db_interface.c
+++ b/sys/arch/sh3/sh3/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.39 2007/02/21 22:59:51 thorpej Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.40 2007/02/22 16:52:55 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 2002 UCHIYAMA Yasushi.  All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.39 2007/02/21 22:59:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.40 2007/02/22 16:52:55 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -133,9 +133,9 @@ kdb_trap(int type, int code, db_regs_t *regs)
 
 	s = splhigh();
 	db_active++;
-	cnpollc(TRUE);
+	cnpollc(true);
 	db_trap(type, code);
-	cnpollc(FALSE);
+	cnpollc(false);
 	db_active--;
 	splx(s);
 
diff --git a/sys/arch/sh3/sh3/db_trace.c b/sys/arch/sh3/sh3/db_trace.c
index ee95da08f57e..1d3c1d144443 100644
--- a/sys/arch/sh3/sh3/db_trace.c
+++ b/sys/arch/sh3/sh3/db_trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_trace.c,v 1.20 2007/02/21 22:59:51 thorpej Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.21 2007/02/22 16:52:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.20 2007/02/21 22:59:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.21 2007/02/22 16:52:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -158,7 +158,7 @@ db_nextframe(
 		goto out;
 
 	for (i = 0; i < 30; i++) {
-		inst = db_get_value(pc, 2, FALSE);
+		inst = db_get_value(pc, 2, false);
 		pc += 2;
 
 		if (inst == 0x6ef3)	/* mov r15,r14 -- end of prologue */
@@ -190,7 +190,7 @@ db_nextframe(
 			continue;
 		}
 		if ((inst & 0xf000) == 0x9000) {
-			if (db_get_value(pc, 2, FALSE) == 0x3f38) {
+			if (db_get_value(pc, 2, false) == 0x3f38) {
 				/* "mov #n,r3; sub r3,r15" */
 				unsigned int disp = (int)(inst & 0xff);
 				int r3;
diff --git a/sys/arch/sh3/sh3/mem.c b/sys/arch/sh3/sh3/mem.c
index 5b1253352c04..e3f3ad0727ac 100644
--- a/sys/arch/sh3/sh3/mem.c
+++ b/sys/arch/sh3/sh3/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.24 2007/02/21 22:59:51 thorpej Exp $	*/
+/*	$NetBSD: mem.c,v 1.25 2007/02/22 16:52:56 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.24 2007/02/21 22:59:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.25 2007/02/22 16:52:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -208,5 +208,5 @@ __mm_mem_addr(paddr_t pa)
 {
 
 	return ((atop(pa) < vm_physmem[0].start || PHYS_TO_VM_PAGE(pa) != NULL)
-	    ? TRUE : FALSE);
+	    ? true : false);
 }
diff --git a/sys/arch/sh3/sh3/pmap.c b/sys/arch/sh3/sh3/pmap.c
index 98c8e17e8cb9..d1c3dbd6902b 100644
--- a/sys/arch/sh3/sh3/pmap.c
+++ b/sys/arch/sh3/sh3/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.59 2007/02/21 22:59:51 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.60 2007/02/22 16:52:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2007/02/21 22:59:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60 2007/02/22 16:52:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -429,12 +429,12 @@ __pmap_map_change(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot,
 
 	if ((pte = __pmap_pte_lookup(pmap, va)) == NULL ||
 	    ((oentry = *pte) == 0))
-		return (FALSE);		/* no mapping exists. */
+		return (false);		/* no mapping exists. */
 
 	if (pa != (oentry & PG_PPN)) {
 		/* Enter a mapping at a mapping to another physical page. */
 		pmap_remove(pmap, va, eva);
-		return (FALSE);
+		return (false);
 	}
 
 	/* Pre-existing mapping */
@@ -454,10 +454,10 @@ __pmap_map_change(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot,
 	} else if (entry & _PG_WIRED) {
 		/* unwired -> wired. make sure to reflect "flags" */
 		pmap_remove(pmap, va, eva);
-		return (FALSE);
+		return (false);
 	}
 
-	return (TRUE);	/* mapping was changed. */
+	return (true);	/* mapping was changed. */
 }
 
 /*
@@ -633,17 +633,17 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 	if (pmap == pmap_kernel() && (va >> 30) == 2) {
 		if (pap != NULL)
 			*pap = va & SH3_PHYS_MASK;
-		return (TRUE);
+		return (true);
 	}
 
 	pte = __pmap_pte_lookup(pmap, va);
 	if (pte == NULL || *pte == 0)
-		return (FALSE);
+		return (false);
 
 	if (pap != NULL)
 		*pap = (*pte & PG_PPN) | (va & PGOFSET);
 
-	return (TRUE);
+	return (true);
 }
 
 void
@@ -790,7 +790,7 @@ bool
 pmap_is_referenced(struct vm_page *pg)
 {
 
-	return ((pg->mdpage.pvh_flags & PVH_REFERENCED) ? TRUE : FALSE);
+	return ((pg->mdpage.pvh_flags & PVH_REFERENCED) ? true : false);
 }
 
 bool
@@ -804,7 +804,7 @@ pmap_clear_reference(struct vm_page *pg)
 	int s;
 
 	if ((pg->mdpage.pvh_flags & PVH_REFERENCED) == 0)
-		return (FALSE);
+		return (false);
 
 	pg->mdpage.pvh_flags &= ~PVH_REFERENCED;
 
@@ -825,14 +825,14 @@ pmap_clear_reference(struct vm_page *pg)
 	}
 	splx(s);
 
-	return (TRUE);
+	return (true);
 }
 
 bool
 pmap_is_modified(struct vm_page *pg)
 {
 
-	return ((pg->mdpage.pvh_flags & PVH_MODIFIED) ? TRUE : FALSE);
+	return ((pg->mdpage.pvh_flags & PVH_MODIFIED) ? true : false);
 }
 
 bool
@@ -848,14 +848,14 @@ pmap_clear_modify(struct vm_page *pg)
 
 	modified = pvh->pvh_flags & PVH_MODIFIED;
 	if (!modified)
-		return (FALSE);
+		return (false);
 
 	pvh->pvh_flags &= ~PVH_MODIFIED;
 
 	s = splvm();
 	if (SLIST_EMPTY(&pvh->pvh_head)) {/* no map on this page */
 		splx(s);
-		return (TRUE);
+		return (true);
 	}
 
 	/* Write-back and invalidate TLB entry */
@@ -880,7 +880,7 @@ pmap_clear_modify(struct vm_page *pg)
 	}
 	splx(s);
 
-	return (TRUE);
+	return (true);
 }
 
 paddr_t
@@ -1017,7 +1017,7 @@ __pmap_pte_load(pmap_t pmap, vaddr_t va, int flags)
 	/* Lookup page table entry */
 	if (((pte = __pmap_pte_lookup(pmap, va)) == NULL) ||
 	    ((entry = *pte) == 0))
-		return (FALSE);
+		return (false);
 
 	KDASSERT(va != 0);
 
@@ -1038,7 +1038,7 @@ __pmap_pte_load(pmap_t pmap, vaddr_t va, int flags)
 	if (pmap->pm_asid != -1)
 		sh_tlb_update(pmap->pm_asid, va, entry);
 
-	return (TRUE);
+	return (true);
 }
 
 /*
diff --git a/sys/arch/sh3/sh3/sh3_machdep.c b/sys/arch/sh3/sh3/sh3_machdep.c
index 816c3a43d94d..21a92cc8be2b 100644
--- a/sys/arch/sh3/sh3/sh3_machdep.c
+++ b/sys/arch/sh3/sh3/sh3_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sh3_machdep.c,v 1.60 2007/02/09 21:55:12 ad Exp $	*/
+/*	$NetBSD: sh3_machdep.c,v 1.61 2007/02/22 16:52:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.60 2007/02/09 21:55:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.61 2007/02/22 16:52:56 thorpej Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
@@ -279,13 +279,13 @@ sh_startup()
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-	    16 * NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+	    16 * NCARGS, VM_MAP_PAGEABLE, false, NULL);
 
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-	    VM_PHYS_SIZE, 0, FALSE, NULL);
+	    VM_PHYS_SIZE, 0, false, NULL);
 
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
diff --git a/sys/arch/sh5/sh5/db_interface.c b/sys/arch/sh5/sh5/db_interface.c
index e530c3a52b4e..7074e7760d3c 100644
--- a/sys/arch/sh5/sh5/db_interface.c
+++ b/sys/arch/sh5/sh5/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.18 2007/02/21 22:59:52 thorpej Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.19 2007/02/22 16:51:43 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.18 2007/02/21 22:59:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.19 2007/02/22 16:51:43 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -263,7 +263,7 @@ kdb_trap(int type, void *v)
 
 	if (IS_BREAKPOINT_TRAP(type, 0)) {
 		int bkpt;
-		bkpt = db_get_value(PC_REGS(DDB_REGS), BKPT_SIZE, FALSE);
+		bkpt = db_get_value(PC_REGS(DDB_REGS), BKPT_SIZE, false);
 		if (bkpt == BKPT_INST)
 			PC_ADVANCE(DDB_REGS);
 	}
@@ -290,10 +290,10 @@ inst_branch(int inst)
 	case 0x640f0000:	/* BGTU Rm, Rn, TRc */
 	case 0x64050000:	/* BNE  Rm, Rn, TRc */
 	case 0xe4050000:	/* BNEI Rm, imm, TRc */
-		return (TRUE);
+		return (true);
 	}
 
-	return (FALSE);
+	return (false);
 }
 
 bool
@@ -303,9 +303,9 @@ inst_unconditional_flow_transfer(int inst)
 	 * Deal with blink <anything>
 	 */
 	if ((inst & 0xff8ffc0f) == 0x4401fc00)
-		return (TRUE);
+		return (true);
 
-	return (FALSE);
+	return (false);
 }
 
 db_addr_t
diff --git a/sys/arch/sh5/sh5/pmap.c b/sys/arch/sh5/sh5/pmap.c
index a7af512437b5..6eb13d6088ef 100644
--- a/sys/arch/sh5/sh5/pmap.c
+++ b/sys/arch/sh5/sh5/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.45 2007/02/21 22:59:52 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.46 2007/02/22 16:51:43 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -103,7 +103,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.45 2007/02/21 22:59:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.46 2007/02/22 16:51:43 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kernel_ipt.h"
@@ -2322,7 +2322,7 @@ pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)
 {
 	struct pvo_entry *pvo;
 	int s, idx;
-	bool found = FALSE;
+	bool found = false;
 
 	PMPRINTF(("pmap_extract: %s: va 0x%lx - ", PMSTR(pm), va));
 
@@ -2336,7 +2336,7 @@ pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)
 		if (__predict_true(pap != NULL))
 			*pap = (paddr_t)(va - SH5_KSEG0_BASE) + pmap_kseg0_pa;
 		PMPRINTF(("KSEG0. pa 0x%lx\n", *pap));
-		return (TRUE);
+		return (true);
 	}
 
 	s = splvm();
@@ -2346,7 +2346,7 @@ pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)
 		if (__predict_true(pap != NULL))
 			*pap = (pvo->pvo_ptel & SH5_PTEL_PPN_MASK) |
 			    sh5_page_offset(va);
-		found = TRUE;
+		found = true;
 		PMPRINTF(("%smanaged pvo. pa 0x%lx\n",
 		    PVO_ISMANAGED(pvo) ? "" : "un",
 		    pap ? *pap : ((pvo->pvo_ptel & SH5_PTEL_PPN_MASK) |
@@ -2360,7 +2360,7 @@ pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)
 			if (__predict_true(pap != NULL))
 				*pap = (ptel & SH5_PTEL_PPN_MASK) |
 				    sh5_page_offset(va);
-			found = TRUE;
+			found = true;
 			PMPRINTF(("no pvo, but kipt pa 0x%lx\n",
 			    pap ? *pap : ((pvo->pvo_ptel & SH5_PTEL_PPN_MASK) |
 			    sh5_page_offset(va))));
@@ -2641,7 +2641,7 @@ pmap_query_bit(struct vm_page *pg, ptel_t ptebit)
 
 	if ((ptel_t)pmap_attr_fetch(pg) & ptebit) {
 		PMPRINTF(("yes. Cached in pg attr.\n"));
-		return (TRUE);
+		return (true);
 	}
 
 	s = splvm();
@@ -2657,7 +2657,7 @@ pmap_query_bit(struct vm_page *pg, ptel_t ptebit)
 			PMPRINTF(("yes. Cached in pvo for 0x%lx.\n",
 			    PVO_VADDR(pvo)));
 			splx(s);
-			return (TRUE);
+			return (true);
 		}
 	}
 
@@ -2685,7 +2685,7 @@ pmap_query_bit(struct vm_page *pg, ptel_t ptebit)
 					    "yes. Cached in ptel for 0x%lx.\n",
 					    PVO_VADDR(pvo)));
 					splx(s);
-					return (TRUE);
+					return (true);
 				}
 			}
 		} else {
@@ -2699,7 +2699,7 @@ pmap_query_bit(struct vm_page *pg, ptel_t ptebit)
 				PMPRINTF(("yes. Cached in kipt for 0x%lx.\n",
 				    PVO_VADDR(pvo)));
 				splx(s);
-				return (TRUE);
+				return (true);
 			}
 		}
 	}
@@ -2708,7 +2708,7 @@ pmap_query_bit(struct vm_page *pg, ptel_t ptebit)
 
 	splx(s);
 
-	return (FALSE);
+	return (false);
 }
 
 bool
@@ -2969,11 +2969,11 @@ pmap_pool_ualloc(struct pool *pp, int flags)
 		return (pvop);
 	}
 
-	if (uvm.page_init_done != TRUE)
+	if (uvm.page_init_done != true)
 		return ((void *)uvm_pageboot_alloc(PAGE_SIZE));
 
 	return ((void *)uvm_km_alloc_poolpage(kmem_map,
-	    (flags & PR_WAITOK) ? TRUE : FALSE));
+	    (flags & PR_WAITOK) ? true : false));
 }
 
 static void
@@ -2995,7 +2995,7 @@ pmap_steal_memory(vsize_t vsize, vaddr_t *vstartp, vaddr_t *vendp)
 	int npgs, bank;
 	struct vm_physseg *ps;
 
-	if (uvm.page_init_done == TRUE)
+	if (uvm.page_init_done == true)
 		panic("pmap_steal_memory: called _after_ bootstrap");
 
 	size = round_page(vsize);
diff --git a/sys/arch/sh5/sh5/vm_machdep.c b/sys/arch/sh5/sh5/vm_machdep.c
index 5caf07aadbb9..eeb7cdc5ffab 100644
--- a/sys/arch/sh5/sh5/vm_machdep.c
+++ b/sys/arch/sh5/sh5/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.14 2006/09/04 20:10:42 scw Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.15 2007/02/22 16:51:43 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.14 2006/09/04 20:10:42 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.15 2007/02/22 16:51:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -265,7 +265,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 
 	upmap = vm_map_pmap(&bp->b_proc->p_vmspace->vm_map);
 	do {
-		if (pmap_extract(upmap, uva, &pa) == FALSE)
+		if (pmap_extract(upmap, uva, &pa) == false)
 			panic("vmapbuf: null page frame");
 		pmap_kenter_pa(kva, pa, VM_PROT_READ | VM_PROT_WRITE);
 		uva += PAGE_SIZE;
diff --git a/sys/arch/shark/shark/ns87307.c b/sys/arch/shark/shark/ns87307.c
index b06fe17e7888..259b461a1fec 100644
--- a/sys/arch/shark/shark/ns87307.c
+++ b/sys/arch/shark/shark/ns87307.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns87307.c,v 1.4 2005/12/11 12:19:05 christos Exp $	*/
+/*	$NetBSD: ns87307.c,v 1.5 2007/02/22 16:50:42 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -57,7 +57,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.4 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.5 2007/02/22 16:50:42 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -108,8 +108,8 @@ __KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.4 2005/12/11 12:19:05 christos Exp $")
 **
 **  function value or completion codes
 **
-**      TRUE    configuration of the kdb device was successful.
-**      FALSE   configuration of the kdb device failed.
+**      true    configuration of the kdb device was successful.
+**      false   configuration of the kdb device failed.
 **
 **  SIDE EFFECTS:
 **
@@ -121,7 +121,7 @@ i87307KbdConfig(bus_space_tag_t iot,
 		u_int           kbdBase, 
 		u_int           irqNum )
 {
-    u_int                configured = FALSE;
+    u_int                configured = false;
     bus_space_handle_t   ioh;	     
 
 
@@ -140,7 +140,7 @@ i87307KbdConfig(bus_space_tag_t iot,
 	*/
 	bus_space_unmap( iot, ioh, NSIO_NPORTS );
 
-	configured = TRUE;
+	configured = true;
     }
 
     return (configured);
@@ -176,8 +176,8 @@ i87307KbdConfig(bus_space_tag_t iot,
 **
 **  function value or completion codes
 **
-**      TRUE    configuration of the kdb device was successful.
-**      FALSE   configuration of the kdb device failed.
+**      true    configuration of the kdb device was successful.
+**      false   configuration of the kdb device failed.
 **
 **  SIDE EFFECTS:
 **
@@ -191,7 +191,7 @@ i87307MouseConfig(bus_space_tag_t iot,
     u_int                configured;
     bus_space_handle_t   ioh;	     
 
-    configured = FALSE; /* be a pessimist */
+    configured = false; /* be a pessimist */
 
     if (!(bus_space_map( iot, CONNSIOADDR, NSIO_NPORTS, 0 , &ioh )))
     {
@@ -206,7 +206,7 @@ i87307MouseConfig(bus_space_tag_t iot,
 	*/
 	bus_space_unmap( iot, ioh, NSIO_NPORTS );
 
-	configured = TRUE;
+	configured = true;
     }
 
 
@@ -242,8 +242,8 @@ i87307MouseConfig(bus_space_tag_t iot,
 **
 **  function value or completion codes
 **
-**      TRUE    configuration of the kdb device was successful.
-**      FALSE   configuration of the kdb device failed.
+**      true    configuration of the kdb device was successful.
+**      false   configuration of the kdb device failed.
 **
 **  SIDE EFFECTS:
 **
@@ -254,7 +254,7 @@ int
 i87307PrinterConfig(bus_space_tag_t iot,
 		  u_int           irqNum )
 {
-    u_int                configured = FALSE;
+    u_int                configured = false;
     bus_space_handle_t   ioh;	     
 
     u_char value;
@@ -284,7 +284,7 @@ i87307PrinterConfig(bus_space_tag_t iot,
         /* unmap the space so can probe later */
     	bus_space_unmap( iot, ioh, NSIO_NPORTS );
     
-    	configured = TRUE;
+    	configured = true;
     }
 
     
diff --git a/sys/arch/shark/shark/ns87307reg.h b/sys/arch/shark/shark/ns87307reg.h
index 7e1f90b01c8d..6f4cea78ff72 100644
--- a/sys/arch/shark/shark/ns87307reg.h
+++ b/sys/arch/shark/shark/ns87307reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns87307reg.h,v 1.4 2005/12/11 12:19:05 christos Exp $	*/
+/*	$NetBSD: ns87307reg.h,v 1.5 2007/02/22 16:50:42 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -58,16 +58,6 @@
 #ifndef _NS87307REG_H
 #define _NS87307REG_H
 
-/*
-** Define TRUE/FALSE if not already defined.  It
-** annoys me that C doesn't do this in a standard 
-** header.
-*/
-#ifndef TRUE
-#define TRUE  1
-#define FALSE 0
-#endif
-
 /*
 ** Macro for debugging
 */
diff --git a/sys/arch/shark/shark/pccons.c b/sys/arch/shark/shark/pccons.c
index bc68331ba0e2..6da9ebe56fae 100644
--- a/sys/arch/shark/shark/pccons.c
+++ b/sys/arch/shark/shark/pccons.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: pccons.c,v 1.27 2006/10/01 18:56:22 elad Exp $       */
+/*      $NetBSD: pccons.c,v 1.28 2007/02/22 16:50:42 thorpej Exp $       */
 
 /*
  * Copyright 1997
@@ -135,7 +135,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.27 2006/10/01 18:56:22 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.28 2007/02/22 16:50:42 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_xserver.h"
@@ -417,8 +417,8 @@ static unsigned int   addr_6845   = MONO_BASE;
 /* Define globals used when acting as console at boot time. 
 */
 static struct pc_softc bootSoftc;
-static u_char          attachCompleted = FALSE;
-static u_char          actingConsole   = FALSE;
+static u_char          attachCompleted = false;
+static u_char          actingConsole   = false;
 
 /* Our default debug settings, when debug is compiled in via config option 
 ** KERNEL_DEBUG that is.
@@ -911,7 +911,7 @@ pcprobe(struct device *parent,
     if (ia->ia_nirq < 1)
 	return (0);
 
-    if (actingConsole == FALSE)
+    if (actingConsole == false)
     {
         iobase = ia->ia_io[0].ir_addr;
         iot    = ia->ia_iot;
@@ -1005,7 +1005,7 @@ pcattach(struct device   *parent,
     ** If the keyboard isn't being used as a console device,
     ** map the register space.
     */
-    if (actingConsole == FALSE)
+    if (actingConsole == false)
     {
         KERN_DEBUG( pcdebug, KERN_DEBUG_INFO,
                    ("\npcattach: mapping io space\n"));
@@ -1077,7 +1077,7 @@ pcattach(struct device   *parent,
     **
     ** THIS MUST BE DONE BEFORE ANY MORE OUTPUT IS DONE.
     */
-    attachCompleted = TRUE;
+    attachCompleted = true;
 
     /* Update screen 
     */
@@ -1650,7 +1650,7 @@ pcioctl(dev_t       dev,
 		    }
 #endif
 		    sc->sc_flags &= ~SC_XMODE;
-                    async_update(sc, FALSE);
+                    async_update(sc, false);
 
 		    /*
 		     * throw away pending data so raw keycodes don't get
@@ -1714,7 +1714,7 @@ pcioctl(dev_t       dev,
                         {
                             /* Update rate in keyboard */
                             sc->kbd.sc_new_typematic_rate = rate;
-                            async_update(sc, FALSE);
+                            async_update(sc, false);
                         }        
                     }
                     else
@@ -1880,7 +1880,7 @@ pcstart(struct tty *tp)
         splx(s);
         cl  = &tp->t_outq;
         len = q_to_b(cl, buf, PCBURST);
-        sput(sc, buf, len, FALSE);
+        sput(sc, buf, len, false);
         s = spltty();
         
         tp->t_state &= ~TS_BUSY;
@@ -2044,7 +2044,7 @@ pccninit(struct consdev *cp)
 {
     int                s = splhigh();
 
-    actingConsole = TRUE;
+    actingConsole = true;
     if (I8042_MAP(bootSoftc.kbd.sc_iot, CONKBDADDR, bootSoftc.kbd.sc_ioh))
     {
         panic("pccninit: kbd mapping failed");
@@ -2130,7 +2130,7 @@ pccnputc(dev_t  dev,
     ** otherwise we use the bootSoftc cause we are the console in boot
     ** sequence.
     */
-    if (attachCompleted == TRUE)
+    if (attachCompleted == true)
     {
         currentSC = pc_cd.cd_devs[PCUNIT(dev)];
     }
@@ -2142,11 +2142,11 @@ pccnputc(dev_t  dev,
     */
     if (c == '\n')
     {
-        sput(currentSC, "\r\n", 2, TRUE);
+        sput(currentSC, "\r\n", 2, true);
     }
     else
     {
-        sput(currentSC, &c, 1, TRUE);
+        sput(currentSC, &c, 1, true);
     }
 
     return;
@@ -2197,7 +2197,7 @@ pccngetc(dev_t dev)
     ** otherwise we use the bootSoftc cause we are the console in boot
     ** sequence.
     */
-    if (attachCompleted == TRUE)
+    if (attachCompleted == true)
     {
         currentSC = pc_cd.cd_devs[PCUNIT(dev)];
     }
@@ -2285,7 +2285,7 @@ pccnpollc(dev_t dev,
     ** otherwise we use the bootSoftc cause we are the console in boot
     ** sequence.
     */
-    if (attachCompleted == TRUE)
+    if (attachCompleted == true)
     {
         currentSC = pc_cd.cd_devs[PCUNIT(dev)];
     }
@@ -2884,7 +2884,7 @@ sput(struct pc_softc   *sc,
             scroll = 0;
             /* scroll check */
             if (crtat >= Crtat + sc->vs.nchr) {
-                if (nowait == FALSE) {
+                if (nowait == false) {
                     int s = spltty();
                     if (sc->kbd.sc_new_lock_state & SCROLL)
                         tsleep(&(sc->kbd.sc_new_lock_state),
@@ -3686,7 +3686,7 @@ xinterpret(struct pc_softc  *sc,
                     */
                     wakeup(&(sc->kbd.sc_new_lock_state));
                 }
-                async_update(sc, FALSE);
+                async_update(sc, false);
             }
         break;
     } /* End switch on scan code type */
@@ -3758,7 +3758,7 @@ sget(struct pc_softc *sc)
         }       
         else if (dt == KBR_EXTENDED)
         {
-            extended = TRUE;
+            extended = true;
         }
         else
         {
@@ -3827,7 +3827,7 @@ sget(struct pc_softc *sc)
                         }
                         /* Update external view of what happened.
                         */
-                        async_update(sc, FALSE);
+                        async_update(sc, false);
                     }
                 break;
                 /*
@@ -4157,7 +4157,7 @@ getDisplayInfo(struct display_info *displayInfP)
     if ((ihandle = get_shark_screen_ihandle()) != -1
        && (phandle = OF_instance_to_package(ihandle)) != -1)
     {
-	displayInfP->init = TRUE;
+	displayInfP->init = true;
 	
 	/* Linear frame buffer virtual and physical address */
 	if (OF_getprop(phandle, "address", &tempval, 
diff --git a/sys/arch/shark/shark/scr.c b/sys/arch/shark/shark/scr.c
index 8c58575da638..427bc50c8fe9 100644
--- a/sys/arch/shark/shark/scr.c
+++ b/sys/arch/shark/shark/scr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scr.c,v 1.20 2006/11/24 19:46:58 christos Exp $	*/
+/*	$NetBSD: scr.c,v 1.21 2007/02/22 16:50:42 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -102,7 +102,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.20 2006/11/24 19:46:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.21 2007/02/22 16:50:42 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -174,21 +174,10 @@ __KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.20 2006/11/24 19:46:58 christos Exp $");
     #define ASSERT(f)
     #define TOGGLE_TEST_PIN()
     //#define INVALID_STATE_CMD(sc,state,cmd)  panic("scr: invalid state/cmd, sc = %X, state = %X, cmd = %X, line = %d",sc,state,cmd,__LINE__);
-    #define INVALID_STATE_CMD(sc,state,cmd)  sc->bigTrouble = TRUE;
+    #define INVALID_STATE_CMD(sc,state,cmd)  sc->bigTrouble = true;
 
 #endif
 
-#ifndef FALSE
-    #define FALSE 0
-#endif
-
-#ifndef TRUE
-    #define TRUE 1
-#endif
-
-
-
-
 
 /* 
 ** The first and last bytes of the debug control variables is reserved for
@@ -527,7 +516,7 @@ static int tsleepIdent;
 ** only 1 device is using the hat at any one time
 ** variable below must be acquired using splhigh before using the hat
 */
-static int hatLock = FALSE;     
+static int hatLock = false;     
 
 
 
@@ -773,7 +762,7 @@ void scrattach(parent, self, aux)
         /* set initial state machine values */
         scrClkInit();
         initStates(sc);
-        sc->open = FALSE;
+        sc->open = false;
     } 
 
     else
@@ -903,7 +892,7 @@ struct lwp *l;
 
 
     /* set all initial conditions */
-    sc->open = TRUE;
+    sc->open = true;
 #endif
 
     KERN_DEBUG (scrdebug, SCROPEN_DEBUG_INFO,("scropen: success \n"));
@@ -970,7 +959,7 @@ int scrclose(dev, flag, mode, l)
         /* put everything in the idle state */
         scrClkInit();
         initStates(sc);
-        sc->open = FALSE;
+        sc->open = false;
 
     } 
     
@@ -1115,7 +1104,7 @@ struct lwp  *l;
                 s = splhigh();
                 if(!hatLock)
                 {
-                    hatLock = TRUE;
+                    hatLock = true;
                     splx(s);
                     break;
                 }
@@ -1145,8 +1134,8 @@ struct lwp  *l;
             else             
             {   
                 // set up the top half 
-                sc->masterDone = FALSE;
-                sc->bigTrouble = FALSE;    /* david/jim, remove this when the dust settles  */
+                sc->masterDone = false;
+                sc->bigTrouble = false;    /* david/jim, remove this when the dust settles  */
 
                         
                 
@@ -1171,7 +1160,7 @@ struct lwp  *l;
                         initStates(sc);
                         cardOff(sc);
                         sc->status = ERROR_CARD_REMOVED;
-                        sc->masterDone = TRUE;
+                        sc->masterDone = true;
                         restore_interrupts(savedInts);
                         // dont stop clock, done at bottom of case 
                     }
@@ -1223,7 +1212,7 @@ struct lwp  *l;
             // release  the hat lock. 
             s = splhigh();
             ASSERT(hatlock);
-            hatLock = FALSE;
+            hatLock = false;
             splx(s);
             
             // david,jim hack to stop ioctl memcpy problem, to be removed when problem fixed ejg
@@ -1259,7 +1248,7 @@ struct lwp  *l;
                 s = splhigh();
                 if(!hatLock)
                 {
-                    hatLock = TRUE;
+                    hatLock = true;
                     splx(s);
                     break;
                 }
@@ -1289,8 +1278,8 @@ struct lwp  *l;
 
             {   
                 // set up the top half 
-                sc->masterDone = FALSE;
-                sc->bigTrouble = FALSE;    /* david/jim, remove this when the dust settles  */
+                sc->masterDone = false;
+                sc->bigTrouble = false;    /* david/jim, remove this when the dust settles  */
                 
                 // start bottom half
                 scrClkStart (sc,sc->clkCountDataSend);
@@ -1319,7 +1308,7 @@ struct lwp  *l;
                         initStates(sc);
                         cardOff(sc);
                         sc->status = ERROR_CARD_REMOVED;
-                        sc->masterDone = TRUE;
+                        sc->masterDone = true;
                         restore_interrupts(savedInts);
                      }
                      masterDoneRetries++;
@@ -1354,7 +1343,7 @@ struct lwp  *l;
             
             // release  the hat lock. 
             s = splhigh();
-            hatLock = FALSE;
+            hatLock = false;
             splx(s);
             
             
@@ -1481,7 +1470,7 @@ static void masterSM(struct scr_softc * sc,int cmd)
                     {
                         /* card not inserted, so just set status and give up */
                         sc->status = ERROR_CARD_REMOVED;
-                        sc->masterDone = TRUE;
+                        sc->masterDone = true;
                     }
                     break;
 
@@ -1527,7 +1516,7 @@ static void masterSM(struct scr_softc * sc,int cmd)
                     {
                         sc->masterS = msIdleOff;
                     }
-                    sc->masterDone = TRUE;
+                    sc->masterDone = true;
                     break;
 
 
@@ -1578,7 +1567,7 @@ static void masterSM(struct scr_softc * sc,int cmd)
                     ** t0SendSM has tried to send , so lets give back results
                     */
                     sc->masterS = msIdleOn;
-                    sc->masterDone = TRUE;
+                    sc->masterDone = true;
                     break;
 
                 default:
@@ -1598,7 +1587,7 @@ static void masterSM(struct scr_softc * sc,int cmd)
                     */
                     sc->pIoctlT0->dataLen = sc->dataCount;
                     sc->masterS = msIdleOn;
-                    sc->masterDone = TRUE;
+                    sc->masterDone = true;
                     break;
 
                 default:
@@ -2269,10 +2258,10 @@ static void   coldResetSM(struct scr_softc * sc,int cmd)
             switch (cmd)
             {
                 case crcStart:
-                    scrSetReset(TRUE);
-                    scrSetClock(TRUE);
+                    scrSetReset(true);
+                    scrSetClock(true);
                     scrSetDataHighZ();
-                    scrSetPower(TRUE);
+                    scrSetPower(true);
 
                     /* start a t2 timer */
                     scrTimeout(coldResetSM,sc,crcT2,T_t2);
@@ -2290,7 +2279,7 @@ static void   coldResetSM(struct scr_softc * sc,int cmd)
             {
                 case crcT2:
                     /* turn off rst */
-                    scrSetReset(FALSE);
+                    scrSetReset(false);
 
                     /* tell master state machine that we are all done */
                     sc->coldResetS = crsIdle;
@@ -3047,13 +3036,13 @@ static void   t0RecvByteSM(struct scr_softc* sc,int cmd)
             {
                 case t0rbcTErrorStart:
                     /* start sending error bit */
-                    scrSetData(FALSE);
+                    scrSetData(false);
                     scrTimeout(t0RecvByteSM,sc,t0rbcTErrorStop,sc->clkCountDataRecv * 2);
                     break;
 
                 case t0rbcTErrorStop:
                     /* stop sending parity error & reset information*/
-                    scrSetData(TRUE);
+                    scrSetData(true);
                     sc->shiftBits   = 0;
                     sc->shiftByte   = 0;
                     sc->shiftParity = 0;
@@ -3156,7 +3145,7 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                     {
                         /* can send start bit now */
                         scrTimeout(t0SendByteSM,sc,t0sbcTClockData,sc->clkCountDataSend);
-                        scrSetData(FALSE);
+                        scrSetData(false);
                         sc->t0SendByteS = t0sbsClockData;
                     }
                     else
@@ -3182,7 +3171,7 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                     TOGGLE_TEST_PIN();
                     /*  set start bit */
                     scrTimeout(t0SendByteSM,sc,t0sbcTClockData,sc->clkCountDataSend);
-                    scrSetData(FALSE);
+                    scrSetData(false);
                     sc->t0SendByteS = t0sbsClockData;
                     break;
 
@@ -3205,12 +3194,12 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                         {
                             if (sc->shiftByte & 0x80)
                             {
-                                scrSetData(FALSE);
+                                scrSetData(false);
                                 sc->shiftParity++;
                             }
                             else
                             {
-                                scrSetData(TRUE);
+                                scrSetData(true);
                             }
                             sc->shiftByte = sc->shiftByte << 1;
                         }
@@ -3219,12 +3208,12 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                             ASSERT(sc->convention == CONVENTION_DIRECT);
                             if (sc->shiftByte & 0x01)
                             {
-                                scrSetData(TRUE);
+                                scrSetData(true);
                                 sc->shiftParity++;
                             }
                             else
                             {
-                                scrSetData(FALSE);
+                                scrSetData(false);
                             }
                             sc->shiftByte = sc->shiftByte >> 1;
                         }
@@ -3238,11 +3227,11 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                         if ( ((sc->shiftParity & 0x01) &&  (sc->convention == CONVENTION_INVERSE))  ||
                              (!(sc->shiftParity & 0x01) && (sc->convention == CONVENTION_DIRECT))     )
                         {
-                            scrSetData(FALSE);
+                            scrSetData(false);
                         }
                         else
                         {
-                            scrSetData(TRUE);
+                            scrSetData(true);
                         }
                         sc->shiftBits++;
                         scrTimeout(t0SendByteSM,sc,t0sbcTClockData,sc->clkCountDataSend);
@@ -3252,7 +3241,7 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                     else
                     {
                         ASSERT(sc->shiftBits > 8);
-                        scrSetData(TRUE);
+                        scrSetData(true);
                         scrTimeout(t0SendByteSM,sc,t0sbcTError,sc->clkCountDataSend);
                         sc->t0SendByteS = t0sbsWaitError;
                     }
@@ -3311,7 +3300,7 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
                     /*  set start bit */
 
                     scrTimeout(t0SendByteSM,sc,t0sbcTClockData,sc->clkCountDataSend);
-                    scrSetData(FALSE);
+                    scrSetData(false);
                     sc->t0SendByteS = t0sbsClockData;
                     break;
 
@@ -3369,10 +3358,10 @@ static void t0SendByteSM (struct scr_softc * sc,int cmd)
 */
 static void   cardOff  (struct scr_softc * sc)
 {
-    scrSetReset(TRUE);
+    scrSetReset(true);
     scrSetDataHighZ();
-    scrSetClock(FALSE);
-    scrSetPower(FALSE);
+    scrSetClock(false);
+    scrSetPower(false);
 }
 
 
diff --git a/sys/arch/sparc/dev/if_ie_obio.c b/sys/arch/sparc/dev/if_ie_obio.c
index ee01a76311b9..586273380746 100644
--- a/sys/arch/sparc/dev/if_ie_obio.c
+++ b/sys/arch/sparc/dev/if_ie_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_obio.c,v 1.33 2005/11/16 00:49:03 uwe Exp $	*/
+/*	$NetBSD: if_ie_obio.c,v 1.34 2007/02/22 16:48:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.33 2005/11/16 00:49:03 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.34 2007/02/22 16:48:59 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -363,7 +363,7 @@ ie_obio_attach(struct device *parent, struct device *self, void *aux)
 	 */
 
 	/* Double map the SCP */
-	if (pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr, &pa) == FALSE)
+	if (pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr, &pa) == false)
 		panic("ie pmap_extract");
 
 	pmap_enter(pmap_kernel(), trunc_page(IEOB_ADBASE+IE_SCP_ADDR),
diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c
index 3631445f0431..3dd82595d624 100644
--- a/sys/arch/sparc/sparc/db_interface.c
+++ b/sys/arch/sparc/sparc/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.70 2007/02/22 05:18:29 matt Exp $ */
+/*	$NetBSD: db_interface.c,v 1.71 2007/02/22 16:48:59 thorpej Exp $ */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.70 2007/02/22 05:18:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.71 2007/02/22 16:48:59 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -330,9 +330,9 @@ kdb_trap(int type, struct trapframe *tf)
 
 	s = splhigh();
 	db_active++;
-	cnpollc(TRUE);
+	cnpollc(true);
 	db_trap(type, 0/*code*/);
-	cnpollc(FALSE);
+	cnpollc(false);
 	db_active--;
 	splx(s);
 
@@ -618,7 +618,7 @@ db_inst_branch(int inst)
     insn.i_int = inst;
 
     if (insn.i_any.i_op != IOP_OP2)
-	return FALSE;
+	return false;
 
     switch (insn.i_op2.i_op2) {
       case IOP2_BPcc:
@@ -627,10 +627,10 @@ db_inst_branch(int inst)
       case IOP2_FBPfcc:
       case IOP2_FBfcc:
       case IOP2_CBccc:
-	return TRUE;
+	return true;
 
       default:
-	return FALSE;
+	return false;
     }
 }
 
@@ -644,13 +644,13 @@ db_inst_call(int inst)
 
     switch (insn.i_any.i_op) {
       case IOP_CALL:
-	return TRUE;
+	return true;
 
       case IOP_reg:
 	return (insn.i_op3.i_op3 == IOP3_JMPL) && !db_inst_return(inst);
 
       default:
-	return FALSE;
+	return false;
     }
 }
 
@@ -663,10 +663,10 @@ db_inst_unconditional_flow_transfer(int inst)
     insn.i_int = inst;
 
     if (db_inst_call(inst))
-	return TRUE;
+	return true;
 
     if (insn.i_any.i_op != IOP_OP2)
-	return FALSE;
+	return false;
 
     switch (insn.i_op2.i_op2)
     {
@@ -678,7 +678,7 @@ db_inst_unconditional_flow_transfer(int inst)
 	return insn.i_branch.i_cond == Icc_A;
 
       default:
-	return FALSE;
+	return false;
     }
 }
 
diff --git a/sys/arch/sparc/sparc/db_trace.c b/sys/arch/sparc/sparc/db_trace.c
index 6e754aebf937..6cd0dc43334a 100644
--- a/sys/arch/sparc/sparc/db_trace.c
+++ b/sys/arch/sparc/sparc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_trace.c,v 1.28 2007/02/22 05:18:29 matt Exp $ */
+/*	$NetBSD: db_trace.c,v 1.29 2007/02/22 16:48:59 thorpej Exp $ */
 
 /*
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.28 2007/02/22 05:18:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.29 2007/02/22 16:48:59 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -52,9 +52,9 @@ db_stack_trace_print(db_expr_t addr, bool have_addr,
 {
 	struct frame	*frame, *prevframe;
 	db_addr_t	pc;
-	bool		kernel_only = TRUE;
-	bool		trace_thread = FALSE;
-	bool		lwpaddr = FALSE;
+	bool		kernel_only = true;
+	bool		trace_thread = false;
+	bool		lwpaddr = false;
 	const char	*cp = modif;
 	char		c;
 
@@ -63,13 +63,13 @@ db_stack_trace_print(db_expr_t addr, bool have_addr,
 
 	while ((c = *cp++) != 0) {
 		if (c == 'a') {
-			lwpaddr = TRUE;
-			trace_thread = TRUE;
+			lwpaddr = true;
+			trace_thread = true;
 		}
 		if (c == 't')
-			trace_thread = TRUE;
+			trace_thread = true;
 		if (c == 'u')
-			kernel_only = FALSE;
+			kernel_only = false;
 	}
 
 	if (!have_addr) {
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 29d0236ce0a4..0f222da98e0e 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.267 2007/02/09 21:55:12 ad Exp $ */
+/*	$NetBSD: machdep.c,v 1.268 2007/02/22 16:48:59 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.267 2007/02/09 21:55:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.268 2007/02/22 16:48:59 thorpej Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
@@ -316,7 +316,7 @@ cpu_startup(void)
 	 */
 	minaddr = 0;
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   16*NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				   16*NCARGS, VM_MAP_PAGEABLE, false, NULL);
 
 	if (CPU_ISSUN4 || CPU_ISSUN4C) {
 		/*
@@ -334,7 +334,7 @@ cpu_startup(void)
 	 * Finally, allocate mbuf cluster submap.
 	 */
         mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-	    nmbclusters * mclbytes, VM_MAP_INTRSAFE, FALSE, NULL);
+	    nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
 
 #ifdef DEBUG
 	pmapdebug = opmapdebug;
diff --git a/sys/arch/sparc/sparc/openfirm.c b/sys/arch/sparc/sparc/openfirm.c
index 624542e3669f..4ae9c913acbc 100644
--- a/sys/arch/sparc/sparc/openfirm.c
+++ b/sys/arch/sparc/sparc/openfirm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: openfirm.c,v 1.14 2006/05/10 06:24:03 skrll Exp $	*/
+/*	$NetBSD: openfirm.c,v 1.15 2007/02/22 16:48:59 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.14 2006/05/10 06:24:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.15 2007/02/22 16:48:59 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -773,7 +773,7 @@ OF_sym2val(void *cells)
 	symbol = (char *)(u_long)args->symbol;
 	if (obp_symbol_debug)
 		prom_printf("looking up symbol %s\n", symbol);
-	args->result = (db_value_of_name(symbol, &value) == TRUE) ? 0 : -1;
+	args->result = (db_value_of_name(symbol, &value) == true) ? 0 : -1;
 	if (obp_symbol_debug)
 		prom_printf("%s is %lx\n", symbol, value);
 	args->value = ADR2CELL(value);
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index 700406cc0610..4ff3532fb876 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.309 2007/02/22 05:18:29 matt Exp $ */
+/*	$NetBSD: pmap.c,v 1.310 2007/02/22 16:48:59 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.309 2007/02/22 05:18:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.310 2007/02/22 16:48:59 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -6346,7 +6346,7 @@ pmap_enu4m(struct pmap *pm, vaddr_t va, vm_prot_t prot, int flags,
 
 	sp = &rp->rg_segmap[vs];
 
-	owired = FALSE;
+	owired = false;
 	if ((pte = sp->sg_pte) == NULL) {
 		/* definitely a new mapping */
 		int i;
@@ -6609,7 +6609,7 @@ pmap_unwire(struct pmap *pm, vaddr_t va)
 	rp = &pm->pm_regmap[vr];
 	sp = &rp->rg_segmap[vs];
 
-	owired = FALSE;
+	owired = false;
 	if (CPU_HAS_SUNMMU) {
 		ptep = &sp->sg_pte[VA_VPG(va)];
 		owired = *ptep & PG_WIRED;
@@ -6661,7 +6661,7 @@ pmap_extract4_4c(struct pmap *pm, vaddr_t va, paddr_t *pap)
 		if (pmapdebug & PDB_FOLLOW)
 			printf("pmap_extract: invalid segment (%d)\n", vr);
 #endif
-		return (FALSE);
+		return (false);
 	}
 	sp = &rp->rg_segmap[vs];
 	ptep = sp->sg_pte;
@@ -6670,7 +6670,7 @@ pmap_extract4_4c(struct pmap *pm, vaddr_t va, paddr_t *pap)
 		if (pmapdebug & PDB_FOLLOW)
 			printf("pmap_extract: invalid segment\n");
 #endif
-		return (FALSE);
+		return (false);
 	}
 	pte = ptep[VA_VPG(va)];
 
@@ -6679,12 +6679,12 @@ pmap_extract4_4c(struct pmap *pm, vaddr_t va, paddr_t *pap)
 		if (pmapdebug & PDB_FOLLOW)
 			printf("pmap_extract: invalid pte\n");
 #endif
-		return (FALSE);
+		return (false);
 	}
 	pte &= PG_PFNUM;
 	if (pap != NULL)
 		*pap = (pte << PGSHIFT) | (va & PGOFSET);
-	return (TRUE);
+	return (true);
 }
 #endif /* SUN4 || SUN4C */
 
@@ -6700,7 +6700,7 @@ pmap_extract4m(struct pmap *pm, vaddr_t va, paddr_t *pap)
 	struct regmap *rp;
 	struct segmap *sp;
 	int pte;
-	int vr, vs, s, v = FALSE;
+	int vr, vs, s, v = false;
 
 	vr = VA_VREG(va);
 	vs = VA_VSEG(va);
@@ -6758,7 +6758,7 @@ pmap_extract4m(struct pmap *pm, vaddr_t va, paddr_t *pap)
 		*pap = ptoa((pte & SRMMU_PPNMASK) >> SRMMU_PPNSHIFT) |
 		    VA_OFF(va);
 
-	v = TRUE;
+	v = true;
 out:
 	if (pm != pmap_kernel())
 		simple_unlock(&pm->pm_lock);
diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c
index 241b3877e8cc..4dda63d407ec 100644
--- a/sys/arch/sparc/sparc/vm_machdep.c
+++ b/sys/arch/sparc/sparc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.88 2007/02/09 21:55:12 ad Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.89 2007/02/22 16:48:59 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.88 2007/02/09 21:55:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.89 2007/02/22 16:48:59 thorpej Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_coredump.h"
@@ -111,7 +111,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	upmap = vm_map_pmap(&bp->b_proc->p_vmspace->vm_map);
 	kpmap = vm_map_pmap(kernel_map);
 	do {
-		if (pmap_extract(upmap, uva, &pa) == FALSE)
+		if (pmap_extract(upmap, uva, &pa) == false)
 			panic("vmapbuf: null page frame");
 		/* Now map the page into kernel space. */
 		pmap_enter(kpmap, kva, pa,
diff --git a/sys/arch/sun2/dev/if_ie_obio.c b/sys/arch/sun2/dev/if_ie_obio.c
index eedbb9ea6d9e..5714411baaef 100644
--- a/sys/arch/sun2/dev/if_ie_obio.c
+++ b/sys/arch/sun2/dev/if_ie_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_obio.c,v 1.10 2005/12/11 12:19:16 christos Exp $	*/
+/*	$NetBSD: if_ie_obio.c,v 1.11 2007/02/22 16:46:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.10 2005/12/11 12:19:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.11 2007/02/22 16:46:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -365,7 +365,7 @@ ie_obio_attach(struct device *parent, struct device *self, void *aux)
 	 */
 
 	/* Double map the SCP */
-	if (pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr, &pa) == FALSE)
+	if (pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr, &pa) == false)
 		panic("ie pmap_extract");
 
 	pmap_enter(pmap_kernel(), m68k_trunc_page(IEOB_ADBASE+IE_SCP_ADDR),
diff --git a/sys/arch/sun2/sun2/locore2.c b/sys/arch/sun2/sun2/locore2.c
index 85706f3dfa5d..b4eedc7b0ca3 100644
--- a/sys/arch/sun2/sun2/locore2.c
+++ b/sys/arch/sun2/sun2/locore2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore2.c,v 1.15 2005/12/11 12:19:16 christos Exp $	*/
+/*	$NetBSD: locore2.c,v 1.16 2007/02/22 16:46:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.15 2005/12/11 12:19:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.16 2007/02/22 16:46:47 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -237,14 +237,14 @@ _verify_hardware(void)
 		cpu_match++;
 		cpu_string = "{120,170}";
 		delay_divisor = 205;	/* 10 MHz */
-		cpu_has_multibus = TRUE;
+		cpu_has_multibus = true;
 		break;
 
 	case ID_SUN2_50 :
 		cpu_match++;
 		cpu_string = "50";
 		delay_divisor = 205;	/* 10 MHz */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 		break;
 
 	default:
diff --git a/sys/arch/sun2/sun2/machdep.c b/sys/arch/sun2/sun2/machdep.c
index 9e15439d95b6..422254c185c1 100644
--- a/sys/arch/sun2/sun2/machdep.c
+++ b/sys/arch/sun2/sun2/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.45 2007/02/09 21:55:13 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.46 2007/02/22 16:46:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -160,7 +160,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2007/02/09 21:55:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2007/02/22 16:46:47 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -350,20 +350,20 @@ cpu_startup(void)
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				   NCARGS, VM_MAP_PAGEABLE, false, NULL);
 
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   VM_PHYS_SIZE, 0, FALSE, NULL);
+				   VM_PHYS_SIZE, 0, false, NULL);
 
 	/*
 	 * Finally, allocate mbuf cluster submap.
 	 */
 	mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 				 nmbclusters * mclbytes, VM_MAP_INTRSAFE,
-				 FALSE, NULL);
+				 false, NULL);
 
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
diff --git a/sys/arch/sun2/sun2/pmap.c b/sys/arch/sun2/sun2/pmap.c
index f5881a071048..30f9a97b2653 100644
--- a/sys/arch/sun2/sun2/pmap.c
+++ b/sys/arch/sun2/sun2/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.30 2007/02/21 22:59:53 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.31 2007/02/22 16:46:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30 2007/02/21 22:59:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.31 2007/02/22 16:46:48 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -1134,21 +1134,21 @@ pv_changepte(paddr_t pa, int set_bits, int clear_bits)
 #endif
 
 		/* Is the PTE currently accessible in some context? */
-		in_ctx = FALSE;
+		in_ctx = false;
 		sme = SEGINV;	/* kill warning */
 		if (pmap == kernel_pmap) {
 			set_context(KERNEL_CONTEXT);
-			in_ctx = TRUE;
+			in_ctx = true;
 		}
 		else if (has_context(pmap)) {
 			/* PMEG may be inactive. */
 			set_context(pmap->pm_ctxnum);
 			sme = get_segmap(va);
 			if (sme != SEGINV)
-				in_ctx = TRUE;
+				in_ctx = true;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/*
 			 * The PTE is in the current context.
 			 * Make sure PTE is up-to-date with VAC.
@@ -1187,7 +1187,7 @@ pv_changepte(paddr_t pa, int set_bits, int clear_bits)
 		pte |= set_bits;
 		pte &= ~clear_bits;
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/* Did cache flush above. */
 			set_pte(va, pte);
 		} else {
@@ -1234,20 +1234,20 @@ pv_syncflags(pv_entry_t pv)
 #endif
 
 		/* Is the PTE currently accessible in some context? */
-		in_ctx = FALSE;
+		in_ctx = false;
 		if (pmap == kernel_pmap) {
 			set_context(KERNEL_CONTEXT);
-			in_ctx = TRUE;
+			in_ctx = true;
 		}
 		else if (has_context(pmap)) {
 			/* PMEG may be inactive. */
 			set_context(pmap->pm_ctxnum);
 			sme = get_segmap(va);
 			if (sme != SEGINV)
-				in_ctx = TRUE;
+				in_ctx = true;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 
 			/*
 			 * The PTE is in the current context.
@@ -1284,7 +1284,7 @@ pv_syncflags(pv_entry_t pv)
 			pte &= ~PG_MODREF;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/* Did cache flush above. */
 			set_pte(va, pte);
 		} else {
@@ -1581,14 +1581,14 @@ pmap_bootstrap(vaddr_t nextva)
 	 * Free up any pmegs in this range which have no mappings.
 	 * VA range: [0x00E00000 .. 0x00F00000]
 	 */
-	pmeg_mon_init(SUN2_MONSTART, SUN2_MONEND, TRUE);
+	pmeg_mon_init(SUN2_MONSTART, SUN2_MONEND, true);
 
 	/*
 	 * Unmap any pmegs left in DVMA space by the PROM.
 	 * DO NOT kill the last one! (owned by the PROM!)
 	 * VA range: [0x00F00000 .. 0x00FE0000]
 	 */
-	pmeg_mon_init(SUN2_MONEND, SUN2_MONEND + DVMA_MAP_SIZE, FALSE);
+	pmeg_mon_init(SUN2_MONEND, SUN2_MONEND + DVMA_MAP_SIZE, false);
 
 	/*
 	 * Done reserving PMEGs and/or clearing out mappings.
@@ -2041,7 +2041,7 @@ pmap_enter_kernel(vaddr_t pgva, int new_pte, bool wired)
 	}
 
 	segva = m68k_trunc_seg(pgva);
-	do_pv = TRUE;
+	do_pv = true;
 
 	/* Do we have a PMEG? */
 	sme = get_segmap(segva);
@@ -2109,7 +2109,7 @@ pmap_enter_kernel(vaddr_t pgva, int new_pte, bool wired)
 	 * Note we get here only with old_pte having PGT_OBMEM.
 	 */
 	if ((old_pte & (PG_TYPE|PG_FRAME)) == (new_pte & (PG_TYPE|PG_FRAME))) {
-		do_pv = FALSE;		/* re-use pv_entry */
+		do_pv = false;		/* re-use pv_entry */
 		new_pte |= (old_pte & PG_NC);
 		goto add_pte;
 	}
@@ -2123,9 +2123,9 @@ add_pte:	/* can be destructive */
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
 		new_pte |= PG_NC;
-		do_pv = FALSE;
+		do_pv = false;
 	}
-	if (do_pv == TRUE) {
+	if (do_pv == true) {
 		if (pv_link(pmap, new_pte, pgva) & PV_NC)
 			new_pte |= PG_NC;
 	}
@@ -2185,7 +2185,7 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	}
 
 	segva = m68k_trunc_seg(pgva);
-	do_pv = TRUE;
+	do_pv = true;
 
 	/*
 	 * If this pmap was sharing the "empty" context,
@@ -2285,7 +2285,7 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	 * Note we get here only with old_pte having PGT_OBMEM.
 	 */
 	if ((old_pte & (PG_TYPE|PG_FRAME)) == (new_pte & (PG_TYPE|PG_FRAME))) {
-		do_pv = FALSE;		/* re-use pv_entry */
+		do_pv = false;		/* re-use pv_entry */
 		new_pte |= (old_pte & PG_NC);
 		goto add_pte;
 	}
@@ -2300,9 +2300,9 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
 		new_pte |= PG_NC;
-		do_pv = FALSE;
+		do_pv = false;
 	}
-	if (do_pv == TRUE) {
+	if (do_pv == true) {
 		if (pv_link(pmap, new_pte, pgva) & PV_NC)
 			new_pte |= PG_NC;
 	}
@@ -2411,7 +2411,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot)
 #endif
 	}
 
-	pmeg_set_wiring(pmegp, va, TRUE);
+	pmeg_set_wiring(pmegp, va, true);
 
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
@@ -2579,7 +2579,7 @@ _pmap_fault(struct vm_map *map, vaddr_t va, vm_prot_t ftype)
 /*
  * This is a shortcut used by the trap handler to
  * reload PMEGs into a user segmap without calling
- * the actual VM fault handler.  Returns TRUE if:
+ * the actual VM fault handler.  Returns true if:
  *	the PMEG was reloaded, and
  *	it has a valid PTE at va.
  * Otherwise return zero and let VM code handle it.
@@ -2730,7 +2730,7 @@ pmap_clear_reference(struct vm_page *pg)
 
 /*
  * Tell whether the given physical page has been referenced.
- * It's OK to just return FALSE if page is not mapped.
+ * It's OK to just return false if page is not mapped.
  */
 bool
 pmap_is_referenced(struct vm_page *pg)
@@ -2928,7 +2928,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 		db_printf("pmap_extract: invalid va=0x%lx\n", va);
 		Debugger();
 #endif
-		return (FALSE);
+		return (false);
 	}
 	pa = PG_PA(pte);
 #ifdef	DIAGNOSTIC
@@ -2938,7 +2938,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 #endif
 	if (pap != NULL)
 		*pap = pa;
-	return (TRUE);
+	return (true);
 }
 
 
@@ -3058,17 +3058,17 @@ pmap_protect1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 
 	/* There is a PMEG, but maybe not active. */
 	old_ctx = INVALID_CONTEXT;
-	in_ctx = FALSE;
+	in_ctx = false;
 	if (has_context(pmap)) {
 		/* Temporary context change. */
 		old_ctx = get_context();
 		set_context(pmap->pm_ctxnum);
 		sme = get_segmap(sva);
 		if (sme != SEGINV)
-			in_ctx = TRUE;
+			in_ctx = true;
 	}
 
-	if (in_ctx == TRUE)
+	if (in_ctx == true)
 		pmap_protect_mmu(pmap, sva, eva);
 	else
 		pmap_protect_noctx(pmap, sva, eva);
@@ -3295,17 +3295,17 @@ pmap_remove1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 
 	/* There is a PMEG, but maybe not active. */
 	old_ctx = INVALID_CONTEXT;
-	in_ctx = FALSE;
+	in_ctx = false;
 	if (has_context(pmap)) {
 		/* Temporary context change. */
 		old_ctx = get_context();
 		set_context(pmap->pm_ctxnum);
 		sme = get_segmap(sva);
 		if (sme != SEGINV)
-			in_ctx = TRUE;
+			in_ctx = true;
 	}
 
-	if (in_ctx == TRUE)
+	if (in_ctx == true)
 		pmap_remove_mmu(pmap, sva, eva);
 	else
 		pmap_remove_noctx(pmap, sva, eva);
diff --git a/sys/arch/sun3/sun3/dvma.c b/sys/arch/sun3/sun3/dvma.c
index bc27c3925911..65b41d372d43 100644
--- a/sys/arch/sun3/sun3/dvma.c
+++ b/sys/arch/sun3/sun3/dvma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvma.c,v 1.31 2007/02/03 16:51:13 tsutsui Exp $	*/
+/*	$NetBSD: dvma.c,v 1.32 2007/02/22 16:45:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.31 2007/02/03 16:51:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.32 2007/02/22 16:45:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -340,7 +340,7 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
 	while (sgsize > 0) {
 		rv = pmap_extract(pmap, kva, &pa);
 #ifdef DIAGNOSTIC
-		if (rv == FALSE)
+		if (rv == false)
 			panic("%s: unmapped VA", __func__);
 #endif
 		pmap_enter(pmap_kernel(), dva, pa | PMAP_NC,
diff --git a/sys/arch/sun3/sun3/locore2.c b/sys/arch/sun3/sun3/locore2.c
index 6222cf16edd3..2bcc39e9f0fa 100644
--- a/sys/arch/sun3/sun3/locore2.c
+++ b/sys/arch/sun3/sun3/locore2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore2.c,v 1.88 2006/10/01 03:53:27 tsutsui Exp $	*/
+/*	$NetBSD: locore2.c,v 1.89 2007/02/22 16:45:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.88 2006/10/01 03:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.89 2007/02/22 16:45:48 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -267,21 +267,21 @@ _verify_hardware(void)
 		cpu_match++;
 		cpu_string = "110";
 		delay_divisor = 120;	/* 17 MHz */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 		break;
 
 	case ID_SUN3_160:
 		cpu_match++;
 		cpu_string = "160";
 		delay_divisor = 120;	/* 17 MHz */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 		break;
 
 	case ID_SUN3_260:
 		cpu_match++;
 		cpu_string = "260";
 		delay_divisor = 82; 	/* 25 MHz */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 #ifdef	HAVECACHE
 		cache_size = 0x10000;	/* 64K */
 #endif
@@ -291,7 +291,7 @@ _verify_hardware(void)
 		cpu_match++;
 		cpu_string = "E";
 		delay_divisor = 102;	/* 20 MHz  XXX: Correct? */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 		break;
 
 	default:
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index efd0d92f1586..3ee7344aeca9 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.179 2007/02/09 21:55:13 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.180 2007/02/22 16:45:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.179 2007/02/09 21:55:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.180 2007/02/22 16:45:48 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -258,20 +258,20 @@ cpu_startup(void)
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   16*NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				   16*NCARGS, VM_MAP_PAGEABLE, false, NULL);
 
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   VM_PHYS_SIZE, 0, FALSE, NULL);
+				   VM_PHYS_SIZE, 0, false, NULL);
 
 	/*
 	 * Finally, allocate mbuf cluster submap.
 	 */
 	mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 				 nmbclusters * mclbytes, VM_MAP_INTRSAFE,
-				 FALSE, NULL);
+				 false, NULL);
 
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c
index 401b17acb579..e6c6486a343b 100644
--- a/sys/arch/sun3/sun3/pmap.c
+++ b/sys/arch/sun3/sun3/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.151 2007/02/21 22:59:54 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.152 2007/02/22 16:45:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.151 2007/02/21 22:59:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.152 2007/02/22 16:45:48 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -1142,19 +1142,19 @@ pv_changepte(paddr_t pa, int set_bits, int clear_bits)
 #endif
 
 		/* Is the PTE currently accessible in some context? */
-		in_ctx = FALSE;
+		in_ctx = false;
 		sme = SEGINV;	/* kill warning */
 		if (pmap == kernel_pmap)
-			in_ctx = TRUE;
+			in_ctx = true;
 		else if (has_context(pmap)) {
 			/* PMEG may be inactive. */
 			set_context(pmap->pm_ctxnum);
 			sme = get_segmap(va);
 			if (sme != SEGINV)
-				in_ctx = TRUE;
+				in_ctx = true;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/*
 			 * The PTE is in the current context.
 			 * Make sure PTE is up-to-date with VAC.
@@ -1193,7 +1193,7 @@ pv_changepte(paddr_t pa, int set_bits, int clear_bits)
 		pte |= set_bits;
 		pte &= ~clear_bits;
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/* Did cache flush above. */
 			set_pte(va, pte);
 		} else {
@@ -1240,18 +1240,18 @@ pv_syncflags(pv_entry_t pv)
 #endif
 
 		/* Is the PTE currently accessible in some context? */
-		in_ctx = FALSE;
+		in_ctx = false;
 		if (pmap == kernel_pmap)
-			in_ctx = TRUE;
+			in_ctx = true;
 		else if (has_context(pmap)) {
 			/* PMEG may be inactive. */
 			set_context(pmap->pm_ctxnum);
 			sme = get_segmap(va);
 			if (sme != SEGINV)
-				in_ctx = TRUE;
+				in_ctx = true;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 
 			/*
 			 * The PTE is in the current context.
@@ -1288,7 +1288,7 @@ pv_syncflags(pv_entry_t pv)
 			pte &= ~PG_MODREF;
 		}
 
-		if (in_ctx == TRUE) {
+		if (in_ctx == true) {
 			/* Did cache flush above. */
 			set_pte(va, pte);
 		} else {
@@ -1616,14 +1616,14 @@ pmap_bootstrap(vaddr_t nextva)
 	 * Free up any pmegs in this range which have no mappings.
 	 * VA range: [0x0FE00000 .. 0x0FF00000]
 	 */
-	pmeg_mon_init(SUN3_MONSTART, SUN3_MONEND, TRUE);
+	pmeg_mon_init(SUN3_MONSTART, SUN3_MONEND, true);
 
 	/*
 	 * Unmap any pmegs left in DVMA space by the PROM.
 	 * DO NOT kill the last one! (owned by the PROM!)
 	 * VA range: [0x0FF00000 .. 0x0FFE0000]
 	 */
-	pmeg_mon_init(SUN3_MONEND, SUN3_MONSHORTSEG, FALSE);
+	pmeg_mon_init(SUN3_MONEND, SUN3_MONSHORTSEG, false);
 
 	/*
 	 * MONSHORTSEG contains MONSHORTPAGE which is a data page
@@ -2068,7 +2068,7 @@ pmap_enter_kernel(vaddr_t pgva, int new_pte, bool wired)
 	}
 
 	segva = m68k_trunc_seg(pgva);
-	do_pv = TRUE;
+	do_pv = true;
 
 	/* Do we have a PMEG? */
 	sme = get_segmap(segva);
@@ -2136,7 +2136,7 @@ pmap_enter_kernel(vaddr_t pgva, int new_pte, bool wired)
 	 * Note we get here only with old_pte having PGT_OBMEM.
 	 */
 	if ((old_pte & (PG_TYPE|PG_FRAME)) == (new_pte & (PG_TYPE|PG_FRAME))) {
-		do_pv = FALSE;		/* re-use pv_entry */
+		do_pv = false;		/* re-use pv_entry */
 		new_pte |= (old_pte & PG_NC);
 		goto add_pte;
 	}
@@ -2150,9 +2150,9 @@ add_pte:	/* can be destructive */
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
 		new_pte |= PG_NC;
-		do_pv = FALSE;
+		do_pv = false;
 	}
-	if (do_pv == TRUE) {
+	if (do_pv == true) {
 		if (pv_link(pmap, new_pte, pgva) & PV_NC)
 			new_pte |= PG_NC;
 	}
@@ -2211,7 +2211,7 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	}
 
 	segva = m68k_trunc_seg(pgva);
-	do_pv = TRUE;
+	do_pv = true;
 
 	/*
 	 * If this pmap was sharing the "empty" context,
@@ -2311,7 +2311,7 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	 * Note we get here only with old_pte having PGT_OBMEM.
 	 */
 	if ((old_pte & (PG_TYPE|PG_FRAME)) == (new_pte & (PG_TYPE|PG_FRAME))) {
-		do_pv = FALSE;		/* re-use pv_entry */
+		do_pv = false;		/* re-use pv_entry */
 		new_pte |= (old_pte & PG_NC);
 		goto add_pte;
 	}
@@ -2326,9 +2326,9 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
 		new_pte |= PG_NC;
-		do_pv = FALSE;
+		do_pv = false;
 	}
-	if (do_pv == TRUE) {
+	if (do_pv == true) {
 		if (pv_link(pmap, new_pte, pgva) & PV_NC)
 			new_pte |= PG_NC;
 	}
@@ -2434,7 +2434,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot)
 #endif
 	}
 
-	pmeg_set_wiring(pmegp, va, TRUE);
+	pmeg_set_wiring(pmegp, va, true);
 
 	/* Anything but MAIN_MEM is mapped non-cached. */
 	if (!IS_MAIN_MEM(new_pte)) {
@@ -2597,7 +2597,7 @@ _pmap_fault(struct vm_map *map, vaddr_t va, vm_prot_t ftype)
 /*
  * This is a shortcut used by the trap handler to
  * reload PMEGs into a user segmap without calling
- * the actual VM fault handler.  Returns TRUE if:
+ * the actual VM fault handler.  Returns true if:
  *	the PMEG was reloaded, and
  *	it has a valid PTE at va.
  * Otherwise return zero and let VM code handle it.
@@ -2748,7 +2748,7 @@ pmap_clear_reference(struct vm_page *pg)
 
 /*
  * Tell whether the given physical page has been referenced.
- * It's OK to just return FALSE if page is not mapped.
+ * It's OK to just return false if page is not mapped.
  */
 bool
 pmap_is_referenced(struct vm_page *pg)
@@ -2905,7 +2905,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 		db_printf("pmap_extract: invalid va=0x%lx\n", va);
 		Debugger();
 #endif
-		return (FALSE);
+		return (false);
 	}
 	pa = PG_PA(pte);
 #ifdef	DIAGNOSTIC
@@ -2915,7 +2915,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 #endif
 	if (pap != NULL)
 		*pap = pa;
-	return (TRUE);
+	return (true);
 }
 
 
@@ -3032,17 +3032,17 @@ pmap_protect1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 
 	/* There is a PMEG, but maybe not active. */
 	old_ctx = INVALID_CONTEXT;
-	in_ctx = FALSE;
+	in_ctx = false;
 	if (has_context(pmap)) {
 		/* Temporary context change. */
 		old_ctx = get_context();
 		set_context(pmap->pm_ctxnum);
 		sme = get_segmap(sva);
 		if (sme != SEGINV)
-			in_ctx = TRUE;
+			in_ctx = true;
 	}
 
-	if (in_ctx == TRUE)
+	if (in_ctx == true)
 		pmap_protect_mmu(pmap, sva, eva);
 	else
 		pmap_protect_noctx(pmap, sva, eva);
@@ -3258,17 +3258,17 @@ pmap_remove1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 
 	/* There is a PMEG, but maybe not active. */
 	old_ctx = INVALID_CONTEXT;
-	in_ctx = FALSE;
+	in_ctx = false;
 	if (has_context(pmap)) {
 		/* Temporary context change. */
 		old_ctx = get_context();
 		set_context(pmap->pm_ctxnum);
 		sme = get_segmap(sva);
 		if (sme != SEGINV)
-			in_ctx = TRUE;
+			in_ctx = true;
 	}
 
-	if (in_ctx == TRUE)
+	if (in_ctx == true)
 		pmap_remove_mmu(pmap, sva, eva);
 	else
 		pmap_remove_noctx(pmap, sva, eva);
diff --git a/sys/arch/sun3/sun3x/dvma.c b/sys/arch/sun3/sun3x/dvma.c
index 9bdda93db378..6b4cbc2398a3 100644
--- a/sys/arch/sun3/sun3x/dvma.c
+++ b/sys/arch/sun3/sun3x/dvma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvma.c,v 1.35 2007/02/21 22:59:54 thorpej Exp $	*/
+/*	$NetBSD: dvma.c,v 1.36 2007/02/22 16:45:49 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.35 2007/02/21 22:59:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.36 2007/02/22 16:45:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -221,7 +221,7 @@ dvma_mapin(void *kmem_va, int len, int canwait)
 		 */
 		rv = pmap_extract(pmap_kernel(), kva, &pa);
 #ifdef	DEBUG
-		if (rv == FALSE)
+		if (rv == false)
 			panic("dvma_mapin: null page frame");
 #endif	/* DEBUG */
 
@@ -353,7 +353,7 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
 	while (sgsize > 0) {
 		rv = pmap_extract(pmap, kva, &pa);
 #ifdef DIAGNOSTIC
-		if (rv == FALSE)
+		if (rv == false)
 			panic("%s: unmapped VA", __func__);
 #endif
 		iommu_enter((dva & IOMMU_VA_MASK), pa);
diff --git a/sys/arch/sun3/sun3x/machdep.c b/sys/arch/sun3/sun3x/machdep.c
index f0b222741ab7..bf4abbc75023 100644
--- a/sys/arch/sun3/sun3x/machdep.c
+++ b/sys/arch/sun3/sun3x/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.105 2007/02/09 21:55:13 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.106 2007/02/22 16:45:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2007/02/09 21:55:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2007/02/22 16:45:49 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -258,20 +258,20 @@ cpu_startup(void)
 	 * limits the number of processes exec'ing at any time.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   16*NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				   16*NCARGS, VM_MAP_PAGEABLE, false, NULL);
 
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   VM_PHYS_SIZE, 0, FALSE, NULL);
+				   VM_PHYS_SIZE, 0, false, NULL);
 
 	/*
 	 * Finally, allocate mbuf cluster submap.
 	 */
 	mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 				 nmbclusters * mclbytes, VM_MAP_INTRSAFE,
-				 FALSE, NULL);
+				 false, NULL);
 
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
@@ -361,13 +361,13 @@ identifycpu(void)
 	case ID_SUN3X_80:
 		cpu_string = "80";  	/* Hydra */
 		delay_divisor = 102;	/* 20 MHz */
-		cpu_has_vme = FALSE;
+		cpu_has_vme = false;
 		break;
 
 	case ID_SUN3X_470:
 		cpu_string = "470"; 	/* Pegasus */
 		delay_divisor = 62; 	/* 33 MHz */
-		cpu_has_vme = TRUE;
+		cpu_has_vme = true;
 		break;
 
 	default:
diff --git a/sys/arch/sun3/sun3x/pmap.c b/sys/arch/sun3/sun3x/pmap.c
index c82bb15c38c7..3f767613ddef 100644
--- a/sys/arch/sun3/sun3x/pmap.c
+++ b/sys/arch/sun3/sun3x/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.94 2007/02/21 22:59:54 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.95 2007/02/22 16:45:49 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94 2007/02/21 22:59:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2007/02/22 16:45:49 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -270,7 +270,7 @@ static TAILQ_HEAD(c_pool_head_struct, c_tmgr_struct) c_pool;
  * resources.
  */
 /* Safe to use pmap_bootstrap_alloc(). */
-static bool bootstrap_alloc_enabled = FALSE;
+static bool bootstrap_alloc_enabled = false;
 /* Temporary virtual pages are in use */
 int tmp_vpages_inuse;
 
@@ -655,7 +655,7 @@ pmap_bootstrap(vaddr_t nextva)
 	/* Don't need avail_start til later. */
 
 	/* We may now call pmap_bootstrap_alloc(). */
-	bootstrap_alloc_enabled = TRUE;
+	bootstrap_alloc_enabled = true;
 
 	/*
 	 * This is a somewhat unwrapped loop to deal with
@@ -804,7 +804,7 @@ pmap_bootstrap(vaddr_t nextva)
 	 * to prevent use of pmap_bootstrap_alloc() hereafter.
 	 */
 	pmap_bootstrap_aalign(PAGE_SIZE);
-	bootstrap_alloc_enabled = FALSE;
+	bootstrap_alloc_enabled = false;
 
 	/*
 	 * Now that we are done with pmap_bootstrap_alloc(), we
@@ -1246,9 +1246,9 @@ static INLINE bool
 is_managed(paddr_t pa)
 {
 	if (pa >= avail_start && pa < avail_end)
-		return TRUE;
+		return true;
 	else
-		return FALSE;
+		return false;
 }
 
 /* get_a_table			INTERNAL
@@ -1287,14 +1287,14 @@ get_a_table(void)
 	 * No re-entrancy worries here.  This table would not be in the
 	 * table pool unless it was available for use.
 	 *
-	 * Note that the second argument to free_a_table() is FALSE.  This
+	 * Note that the second argument to free_a_table() is false.  This
 	 * indicates that the table should not be relinked into the A table
 	 * pool.  That is a job for the function that called us.
 	 */
 	if (tbl->at_parent) {
 		KASSERT(tbl->at_wcnt == 0);
 		pmap = tbl->at_parent;
-		free_a_table(tbl, FALSE);
+		free_a_table(tbl, false);
 		pmap->pm_a_tmgr = NULL;
 		pmap->pm_a_phys = kernAphys;
 	}
@@ -1319,7 +1319,7 @@ get_b_table(void)
 		KASSERT(tbl->bt_wcnt == 0);
 		tbl->bt_parent->at_dtbl[tbl->bt_pidx].attr.raw = MMU_DT_INVALID;
 		tbl->bt_parent->at_ecnt--;
-		free_b_table(tbl, FALSE);
+		free_b_table(tbl, false);
 	}
 	return tbl;
 }
@@ -1342,7 +1342,7 @@ get_c_table(void)
 		KASSERT(tbl->ct_wcnt == 0);
 		tbl->ct_parent->bt_dtbl[tbl->ct_pidx].attr.raw = MMU_DT_INVALID;
 		tbl->ct_parent->bt_ecnt--;
-		free_c_table(tbl, FALSE);
+		free_c_table(tbl, false);
 	}
 	return tbl;
 }
@@ -1434,7 +1434,7 @@ free_a_table(a_tmgr_t *a_tbl, bool relink)
 				dtbl = mmu_ptov(dte[i].addr.raw);
 				b_tbl = mmuB2tmgr(dtbl);
 				bt_wired = b_tbl->bt_wcnt;
-				removed_cnt += free_b_table(b_tbl, TRUE);
+				removed_cnt += free_b_table(b_tbl, true);
 				if (bt_wired)
 					a_tbl->at_wcnt--;
 				dte[i].attr.raw = MMU_DT_INVALID;
@@ -1477,7 +1477,7 @@ free_b_table(b_tmgr_t *b_tbl, bool relink)
 				dtbl = mmu_ptov(MMU_DTE_PA(dte[i]));
 				c_tbl = mmuC2tmgr(dtbl);
 				ct_wired = c_tbl->ct_wcnt;
-				removed_cnt += free_c_table(c_tbl, TRUE);
+				removed_cnt += free_c_table(c_tbl, true);
 				if (ct_wired)
 					b_tbl->bt_wcnt--;
 				dte[i].attr.raw = MMU_DT_INVALID;
@@ -1615,7 +1615,7 @@ pmap_remove_pte(mmu_short_pte_t *pte)
  **
  * Retrieve the addresses of all table managers involved in the mapping of
  * the given virtual address.  If the table walk completed successfully,
- * return TRUE.  If it was only partially successful, return FALSE.
+ * return true.  If it was only partially successful, return false.
  * The table walk performed by this function is important to many other
  * functions in this module.
  *
@@ -1630,19 +1630,19 @@ pmap_stroll(pmap_t pmap, vaddr_t va, a_tmgr_t **a_tbl, b_tmgr_t **b_tbl,
 	mmu_short_dte_t *b_dte;  /* B: short descriptor table         */
 
 	if (pmap == pmap_kernel())
-		return FALSE;
+		return false;
 
 	/* Does the given pmap have its own A table? */
 	*a_tbl = pmap->pm_a_tmgr;
 	if (*a_tbl == NULL)
-		return FALSE; /* No.  Return unknown. */
+		return false; /* No.  Return unknown. */
 	/* Does the A table have a valid B table
 	 * under the corresponding table entry?
 	 */
 	*a_idx = MMU_TIA(va);
 	a_dte = &((*a_tbl)->at_dtbl[*a_idx]);
 	if (!MMU_VALID_DT(*a_dte))
-		return FALSE; /* No. Return unknown. */
+		return false; /* No. Return unknown. */
 	/* Yes. Extract B table from the A table. */
 	*b_tbl = mmuB2tmgr(mmu_ptov(a_dte->addr.raw));
 	/*
@@ -1652,13 +1652,13 @@ pmap_stroll(pmap_t pmap, vaddr_t va, a_tmgr_t **a_tbl, b_tmgr_t **b_tbl,
 	*b_idx = MMU_TIB(va);
 	b_dte = &((*b_tbl)->bt_dtbl[*b_idx]);
 	if (!MMU_VALID_DT(*b_dte))
-		return FALSE; /* No. Return unknown. */
+		return false; /* No. Return unknown. */
 	/* Yes. Extract C table from the B table. */
 	*c_tbl = mmuC2tmgr(mmu_ptov(MMU_DTE_PA(*b_dte)));
 	*pte_idx = MMU_TIC(va);
 	*pte = &((*c_tbl)->ct_dtbl[*pte_idx]);
 	
-	return TRUE;
+	return true;
 }
 	
 /* pmap_enter			INTERFACE
@@ -1724,7 +1724,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 	 * Any other area of the address space is likely to belong to a
 	 * device and hence it would be disasterous to cache its contents.
 	 */
-	if ((managed = is_managed(pa)) == FALSE)
+	if ((managed = is_managed(pa)) == false)
 		mapflags |= PMAP_NC;
 
 	/*
@@ -1954,7 +1954,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 			 * Yes, mark that it does not need to be reinserted
 			 * into the PV list.
 			 */
-			insert = FALSE;
+			insert = false;
 
 			/*
 			 * Clear all but the modified, referenced and wired
@@ -1965,7 +1965,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 		} else {
 			/* No, remove the old entry */
 			pmap_remove_pte(c_pte);
-			insert = TRUE;
+			insert = true;
 		}
 
 		/*
@@ -1985,7 +1985,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 		c_pte->attr.raw = 0;
 
 		/* It will also need to be inserted into the PV list. */
-		insert = TRUE;
+		insert = true;
 	}
 
 	/*
@@ -2098,9 +2098,9 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
 	pa &= MMU_PAGE_MASK;
 
 	if (is_managed(pa))
-		insert = TRUE; 
+		insert = true; 
 	else
-		insert = FALSE;
+		insert = false;
 
 	/*
 	 * Calculate the index of the PTE being modified.
@@ -2111,7 +2111,7 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
 	pte = &kernCbase[pte_idx];
 
 	if (MMU_VALID_DT(*pte)) {
-		was_valid = TRUE;
+		was_valid = true;
 		/*
 		 * If the PTE already maps a different
 		 * physical address, umap and pv_unlink.
@@ -2124,7 +2124,7 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
 		     * Old PA and new PA are the same.  No need to
 		     * relink the mapping within the PV list.
 		     */
-		     insert = FALSE;
+		     insert = false;
 
 		    /*
 		     * Save any mod/ref bits on the PTE.
@@ -2133,7 +2133,7 @@ pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
 		}
 	} else {
 		pte->attr.raw = MMU_DT_INVALID;
-		was_valid = FALSE;
+		was_valid = false;
 	}
 
 	/*
@@ -2408,7 +2408,7 @@ pmap_unwire(pmap_t pmap, vaddr_t va)
 	 * Return immediately.
 	 */
 	if (pmap_stroll(pmap, va, &a_tbl, &b_tbl, &c_tbl, &pte, &a_idx,
-		&b_idx, &c_idx) == FALSE)
+		&b_idx, &c_idx) == false)
 		return;
 
 
@@ -2613,7 +2613,7 @@ pmap_release(pmap_t pmap)
 		printf("pmap_release: still have table\n");
 		Debugger();
 #endif
-		free_a_table(pmap->pm_a_tmgr, TRUE);
+		free_a_table(pmap->pm_a_tmgr, true);
 		pmap->pm_a_tmgr = NULL;
 		pmap->pm_a_phys = kernAphys;
 	}
@@ -2683,7 +2683,7 @@ pmap_is_referenced(struct vm_page *pg)
 
 	pv = pa2pv(pa);
 	if (pv->pv_flags & PV_FLAGS_USED)
-		return TRUE;
+		return true;
 
 	/*
 	 * Search through all pv elements pointing
@@ -2692,10 +2692,10 @@ pmap_is_referenced(struct vm_page *pg)
 
 	for (idx = pv->pv_idx; idx != PVE_EOL; idx = pvebase[idx].pve_next) {
 		if (MMU_PTE_USED(kernCbase[idx])) {
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 /* pmap_is_modified			INTERFACE
@@ -2713,18 +2713,18 @@ pmap_is_modified(struct vm_page *pg)
 	/* see comments in pmap_is_referenced() */
 	pv = pa2pv(pa);
 	if (pv->pv_flags & PV_FLAGS_MDFY)
-		return TRUE;
+		return true;
 
 	for (idx = pv->pv_idx;
 		 idx != PVE_EOL;
 		 idx = pvebase[idx].pve_next) {
 
 		if (MMU_PTE_MODIFIED(kernCbase[idx])) {
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 /* pmap_page_protect			INTERFACE
@@ -2948,10 +2948,10 @@ pmap_extract_kernel(vaddr_t va, paddr_t *pap)
 
 	pte = &kernCbase[(u_int)m68k_btop(va - KERNBASE)];
 	if (!MMU_VALID_DT(*pte))
-		return FALSE;
+		return false;
 	if (pap != NULL)
 		*pap = MMU_PTE_PA(*pte);
-	return TRUE;
+	return true;
 }
 
 /* pmap_extract			INTERFACE
@@ -2975,15 +2975,15 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 		return pmap_extract_kernel(va, pap);
 
 	if (pmap_stroll(pmap, va, &a_tbl, &b_tbl, &c_tbl,
-		&c_pte, &a_idx, &b_idx, &pte_idx) == FALSE)
-		return FALSE;
+		&c_pte, &a_idx, &b_idx, &pte_idx) == false)
+		return false;
 
 	if (!MMU_VALID_DT(*c_pte))
-		return FALSE;
+		return false;
 
 	if (pap != NULL)
 		*pap = MMU_PTE_PA(*c_pte);
-	return TRUE;
+	return true;
 }
 
 /* pmap_remove_kernel		INTERNAL
@@ -3070,7 +3070,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
  * pmap_remove_b().
  *
  * If the removal operation results in an empty A table, the function returns
- * TRUE.
+ * true.
  *
  * It's ugly but will do for now.
  */
@@ -3200,7 +3200,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
 				b_tbl = mmuB2tmgr(b_dte);
 				bt_wired = b_tbl->bt_wcnt;
 
-				free_b_table(b_tbl, TRUE);
+				free_b_table(b_tbl, true);
 
 				/*
 				 * All child entries has been removed.
@@ -3268,7 +3268,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
 
 	/*
 	 * If there are no more entries in the A table, release it
-	 * back to the available pool and return TRUE.
+	 * back to the available pool and return true.
 	 */
 	if (a_tbl->at_ecnt == 0) {
 		KASSERT(a_tbl->at_wcnt == 0);
@@ -3276,7 +3276,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
 		if (!at_wired)
 			TAILQ_REMOVE(&a_pool, a_tbl, at_link);
 		TAILQ_INSERT_HEAD(&a_pool, a_tbl, at_link);
-		empty = TRUE;
+		empty = true;
 	} else {
 		/*
 		 * If the table doesn't have wired entries any longer
@@ -3285,7 +3285,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
 		 */
 		if (at_wired && a_tbl->at_wcnt == 0)
 			TAILQ_INSERT_TAIL(&a_pool, a_tbl, at_link);
-		empty = FALSE;
+		empty = false;
 	}
 
 	return empty;
@@ -3296,7 +3296,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t sva, vaddr_t eva)
  * Remove a range of addresses from an address space, trying to remove entire
  * C tables if possible.
  *
- * If the operation results in an empty B table, the function returns TRUE.
+ * If the operation results in an empty B table, the function returns true.
  */
 bool 
 pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t sva, vaddr_t eva)
@@ -3350,7 +3350,7 @@ pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t sva, vaddr_t eva)
 				c_tbl = mmuC2tmgr(c_dte);
 				ct_wired = c_tbl->ct_wcnt;
 
-				free_c_table(c_tbl, TRUE);
+				free_c_table(c_tbl, true);
 
 				/*
 				 * All child entries has been removed.
@@ -3396,7 +3396,7 @@ pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t sva, vaddr_t eva)
 		if (!bt_wired)
 			TAILQ_REMOVE(&b_pool, b_tbl, bt_link);
 		TAILQ_INSERT_HEAD(&b_pool, b_tbl, bt_link);
-		empty = TRUE;
+		empty = true;
 	} else {
 		/*
 		 * If the table doesn't have wired entries any longer
@@ -3406,7 +3406,7 @@ pmap_remove_b(b_tmgr_t *b_tbl, vaddr_t sva, vaddr_t eva)
 		if (bt_wired && b_tbl->bt_wcnt == 0)
 			TAILQ_INSERT_TAIL(&b_pool, b_tbl, bt_link);
 
-		empty = FALSE;
+		empty = false;
 	}
 
 	return empty;
@@ -3443,7 +3443,7 @@ pmap_remove_c(c_tmgr_t *c_tbl, vaddr_t sva, vaddr_t eva)
 		if (!ct_wired)
 			TAILQ_REMOVE(&c_pool, c_tbl, ct_link);
 		TAILQ_INSERT_HEAD(&c_pool, c_tbl, ct_link);
-		empty = TRUE;
+		empty = true;
 	} else {
 		/*
 		 * If the table doesn't have wired entries any longer
@@ -3452,7 +3452,7 @@ pmap_remove_c(c_tmgr_t *c_tbl, vaddr_t sva, vaddr_t eva)
 		 */
 		if (ct_wired && c_tbl->ct_wcnt == 0)
 			TAILQ_INSERT_TAIL(&c_pool, c_tbl, ct_link);
-		empty = FALSE;
+		empty = false;
 	}
 
 	return empty;
@@ -3471,7 +3471,7 @@ pmap_bootstrap_alloc(int size)
 	void *rtn;
 
 #ifdef	PMAP_DEBUG
-	if (bootstrap_alloc_enabled == FALSE) {
+	if (bootstrap_alloc_enabled == false) {
 		mon_printf("pmap_bootstrap_alloc: disabled\n");
 		sunmon_abort();
 	}