Index: dev/atkbdc/atkbdc_ebus.c
===================================================================
--- dev/atkbdc/atkbdc_ebus.c	(revision 299702)
+++ dev/atkbdc/atkbdc_ebus.c	(working copy)
@@ -242,7 +242,7 @@
 			device_printf(dev,
 			    "<%s>: only two children per 8042 supported\n",
 			    cname);
-			free(cname, M_OFWPROP);
+			OF_prop_free(cname);
 			continue;
 		}
 		adi = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
@@ -249,7 +249,7 @@
 		    M_NOWAIT | M_ZERO);
 		if (adi == NULL) {
 			device_printf(dev, "<%s>: malloc failed\n", cname);
-			free(cname, M_OFWPROP);
+			OF_prop_free(cname);
 			continue;
 		}
 		if (strcmp(cname, "kb_ps2") == 0) {
@@ -261,7 +261,7 @@
 		} else {
 			device_printf(dev, "<%s>: unknown device\n", cname);
 			free(adi, M_ATKBDDEV);
-			free(cname, M_OFWPROP);
+			OF_prop_free(cname);
 			continue;
 		}
 		intr = bus_get_resource_start(dev, SYS_RES_IRQ, adi->rid);
@@ -270,7 +270,7 @@
 			    "<%s>: cannot determine interrupt resource\n",
 			    cname);
 			free(adi, M_ATKBDDEV);
-			free(cname, M_OFWPROP);
+			OF_prop_free(cname);
 			continue;
 		}
 		resource_list_init(&adi->resources);
@@ -281,7 +281,7 @@
 			    cname);
 			resource_list_free(&adi->resources);
 			free(adi, M_ATKBDDEV);
-			free(cname, M_OFWPROP);
+			OF_prop_free(cname);
 			continue;
 		}
 		device_set_ivars(cdev, adi);
Index: dev/le/lebuffer_sbus.c
===================================================================
--- dev/le/lebuffer_sbus.c	(revision 299702)
+++ dev/le/lebuffer_sbus.c	(working copy)
@@ -197,7 +197,7 @@
 		if (slot != -1 && slot != rslot) {
 			device_printf(dev, "<%s>: multiple slots\n",
 			    ldi->ldi_obdinfo.obd_name);
-			free(reg, M_OFWPROP);
+			OF_prop_free(reg);
 			goto fail;
 		}
 		slot = rslot;
@@ -205,7 +205,7 @@
 		resource_list_add(&ldi->ldi_rl, SYS_RES_MEMORY, i, base,
 		    base + reg[i].sbr_size, reg[i].sbr_size);
 	}
-	free(reg, M_OFWPROP);
+	OF_prop_free(reg);
 	if (slot != sbus_get_slot(dev)) {
 		device_printf(dev, "<%s>: parent and child slot do not match\n",
 		    ldi->ldi_obdinfo.obd_name);
@@ -231,7 +231,7 @@
 			resource_list_add(&ldi->ldi_rl, SYS_RES_IRQ, i,
 			    iv, iv, 1);
 		}
-		free(intr, M_OFWPROP);
+		OF_prop_free(intr);
 	}
 	return (ldi);
 
Index: sparc64/fhc/fhc.c
===================================================================
--- sparc64/fhc/fhc.c	(revision 299702)
+++ sparc64/fhc/fhc.c	(working copy)
@@ -205,7 +205,7 @@
 	device_printf(dev, "board %d, ", board);
 	if (OF_getprop_alloc(node, "board-model", 1, (void **)&name) != -1) {
 		printf("model %s\n", name);
-		free(name, M_OFWPROP);
+		OF_prop_free(name);
 	} else
 		printf("model unknown\n");
 
@@ -297,7 +297,7 @@
 			resource_list_add(&fdi->fdi_rl, SYS_RES_MEMORY, j,
 			    reg[j].sbr_offset, reg[j].sbr_offset +
 			    reg[j].sbr_size, reg[j].sbr_size);
-		free(reg, M_OFWPROP);
+		OF_prop_free(reg);
 		if (central == 1) {
 			i = OF_getprop_alloc(child, "interrupts",
 			    sizeof(*intr), (void **)&intr);
@@ -307,7 +307,7 @@
 					resource_list_add(&fdi->fdi_rl,
 					    SYS_RES_IRQ, j, iv, iv, 1);
 				}
-				free(intr, M_OFWPROP);
+				OF_prop_free(intr);
 			}
 		}
 		cdev = device_add_child(dev, NULL, -1);
Index: sparc64/sbus/sbus.c
===================================================================
--- sparc64/sbus/sbus.c	(revision 299702)
+++ sparc64/sbus/sbus.c	(working copy)
@@ -331,7 +331,7 @@
 		sc->sc_rd[i].rd_pend = phys + size;
 		sc->sc_rd[i].rd_res = res;
 	}
-	free(range, M_OFWPROP);
+	OF_prop_free(range);
 
 	/*
 	 * Get the SBus burst transfer size if burst transfers are supported.
@@ -495,7 +495,7 @@
 			if (slot != -1 && slot != rslot) {
 				device_printf(dev, "<%s>: multiple slots\n",
 				    sdi->sdi_obdinfo.obd_name);
-				free(reg, M_OFWPROP);
+				OF_prop_free(reg);
 				goto fail;
 			}
 			slot = rslot;
@@ -503,7 +503,7 @@
 			resource_list_add(&sdi->sdi_rl, SYS_RES_MEMORY, i,
 			    base, base + reg[i].sbr_size, reg[i].sbr_size);
 		}
-		free(reg, M_OFWPROP);
+		OF_prop_free(reg);
 	}
 	sdi->sdi_slot = slot;
 
@@ -525,7 +525,7 @@
 			resource_list_add(&sdi->sdi_rl, SYS_RES_IRQ, i,
 			    iv, iv, 1);
 		}
-		free(intr, M_OFWPROP);
+		OF_prop_free(intr);
 	}
 	if (OF_getprop(node, "burst-sizes", &sdi->sdi_burstsz,
 	    sizeof(sdi->sdi_burstsz)) == -1)
Index: sparc64/sbus/dma_sbus.c
===================================================================
--- sparc64/sbus/dma_sbus.c	(revision 299702)
+++ sparc64/sbus/dma_sbus.c	(working copy)
@@ -216,7 +216,7 @@
 				csr &= ~E_TP_AUI;
 			else
 				csr |= E_TP_AUI;
-			free(cabletype, M_OFWPROP);
+			OF_prop_free(cabletype);
 		}
 		L64854_SCSR(lsc, csr);
 		DELAY(20000);	/* manual says we need a 20ms delay */
@@ -309,7 +309,7 @@
 		if (slot != -1 && slot != rslot) {
 			device_printf(dev, "<%s>: multiple slots\n",
 			    ddi->ddi_obdinfo.obd_name);
-			free(reg, M_OFWPROP);
+			OF_prop_free(reg);
 			goto fail;
 		}
 		slot = rslot;
@@ -317,7 +317,7 @@
 		resource_list_add(&ddi->ddi_rl, SYS_RES_MEMORY, i, base,
 		    base + reg[i].sbr_size, reg[i].sbr_size);
 	}
-	free(reg, M_OFWPROP);
+	OF_prop_free(reg);
 	if (slot != dsc->sc_slot) {
 		device_printf(dev, "<%s>: parent and child slot do not match\n",
 		    ddi->ddi_obdinfo.obd_name);
@@ -343,7 +343,7 @@
 			resource_list_add(&ddi->ddi_rl, SYS_RES_IRQ, i,
 			    iv, iv, 1);
 		}
-		free(intr, M_OFWPROP);
+		OF_prop_free(intr);
 	}
 	return (ddi);
 
Index: sparc64/ebus/ebus.c
===================================================================
--- sparc64/ebus/ebus.c	(revision 299702)
+++ sparc64/ebus/ebus.c	(working copy)
@@ -376,7 +376,7 @@
 		}
 	}
 	free(sc->sc_rinfo, M_DEVBUF);
-	free(sc->sc_range, M_OFWPROP);
+	OF_prop_free(sc->sc_range);
 	return (ENXIO);
 }
 
@@ -670,7 +670,7 @@
 		(void)resource_list_add(&edi->edi_rl, SYS_RES_MEMORY, i,
 		    start, start + regs[i].size - 1, regs[i].size);
 	}
-	free(regs, M_OFWPROP);
+	OF_prop_free(regs);
 
 	nintr = OF_getprop_alloc(node, "interrupts",  sizeof(*intrs),
 	    (void **)&intrs);
@@ -701,7 +701,7 @@
 		(void)resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i, rintr,
 		    rintr, 1);
 	}
-	free(intrs, M_OFWPROP);
+	OF_prop_free(intrs);
 	return (edi);
 }
 
Index: sparc64/pci/ofw_pci.c
===================================================================
--- sparc64/pci/ofw_pci.c	(revision 299702)
+++ sparc64/pci/ofw_pci.c	(working copy)
@@ -100,12 +100,12 @@
 		if (sc->sc_pci_bh[j] != 0) {
 			device_printf(dev, "duplicate range for space %d\n",
 			    j);
-			free(range, M_OFWPROP);
+			OF_prop_free(range);
 			return (EINVAL);
 		}
 		sc->sc_pci_bh[j] = OFW_PCI_RANGE_PHYS(&range[i]);
 	}
-	free(range, M_OFWPROP);
+	OF_prop_free(range);
 
 	/*
 	 * Make sure that the expected ranges are actually present.
Index: sparc64/sparc64/nexus.c
===================================================================
--- sparc64/sparc64/nexus.c	(revision 299702)
+++ sparc64/sparc64/nexus.c	(working copy)
@@ -559,7 +559,7 @@
 			resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i,
 			    phys, phys + size - 1, size);
 	}
-	free(reg, M_OFWPROP);
+	OF_prop_free(reg);
 
 	nintr = OF_getprop_alloc(node, "interrupts",  sizeof(*intr),
 	    (void **)&intr);
@@ -568,7 +568,7 @@
 		    "upa-portid" : "portid", &ign, sizeof(ign)) <= 0) {
 			device_printf(dev, "<%s>: could not determine portid\n",
 			    ndi->ndi_obdinfo.obd_name);
-			free(intr, M_OFWPROP);
+			OF_prop_free(intr);
 			goto fail;
 		}
 
@@ -579,7 +579,7 @@
 			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i],
 			    intr[i], 1);
 		}
-		free(intr, M_OFWPROP);
+		OF_prop_free(intr);
 	}
 
 	return (ndi);
Index: sparc64/sparc64/upa.c
===================================================================
--- sparc64/sparc64/upa.c	(revision 299702)
+++ sparc64/sparc64/upa.c	(working copy)
@@ -560,7 +560,7 @@
 	for (i = 0; i < nreg; i++)
 		resource_list_add(&udi->udi_rl, SYS_RES_MEMORY, i, reg[i].phys,
 		    reg[i].phys + reg[i].size - 1, reg[i].size);
-	free(reg, M_OFWPROP);
+	OF_prop_free(reg);
 
 	intr = INTMAP_VEC(sc->sc_ign, (UPA_INO_BASE + portid));
 	resource_list_add(&udi->udi_rl, SYS_RES_IRQ, 0, intr, intr, 1);
Index: sparc64/isa/isa.c
===================================================================
--- sparc64/isa/isa.c	(revision 299702)
+++ sparc64/isa/isa.c	(working copy)
@@ -169,7 +169,7 @@
 		 */
 		if (strcmp(name, "8042") == 0) {
 			isa_setup_children(dev, node);
-			free(name, M_OFWPROP);
+			OF_prop_free(name);
 			continue;
 		}
 
@@ -179,7 +179,7 @@
 		if (ofw_isa_pnp_map[i].name == NULL) {
 			device_printf(dev, "no PnP map entry for node "
 			    "0x%lx: %s\n", (unsigned long)node, name);
-			free(name, M_OFWPROP);
+			OF_prop_free(name);
 			continue;
 		}
 
@@ -230,10 +230,10 @@
 				}
 			}
 			if (regidx != NULL)
-				free(regidx, M_OFWPROP);
+				OF_prop_free(regidx);
 		}
 		if (regs != NULL)
-			free(regs, M_OFWPROP);
+			OF_prop_free(regs);
 
 		nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intrs),
 		    (void **)&intrs);
@@ -251,7 +251,7 @@
 			bus_set_resource(cdev, SYS_RES_IRQ, i, rintr, 1);
 		}
 		if (intrs != NULL)
-			free(intrs, M_OFWPROP);
+			OF_prop_free(intrs);
 
 		ndrq = OF_getprop_alloc(node, "dma-channel", sizeof(*drqs),
 		    (void **)&drqs);
@@ -258,7 +258,7 @@
 		for (i = 0; i < ndrq; i++)
 			bus_set_resource(cdev, SYS_RES_DRQ, i, drqs[i], 1);
 		if (drqs != NULL)
-			free(drqs, M_OFWPROP);
+			OF_prop_free(drqs);
 
 		/*
 		 * Devices using DMA hang off of the `dma' node instead of
@@ -267,7 +267,7 @@
 		if (strcmp(name, "dma") == 0)
 			isa_setup_children(dev, node);
 
-		free(name, M_OFWPROP);
+		OF_prop_free(name);
 	}
 }
 
Index: sparc64/central/central.c
===================================================================
--- sparc64/central/central.c	(revision 299702)
+++ sparc64/central/central.c	(working copy)
@@ -165,7 +165,7 @@
 			resource_list_add(&cdi->cdi_rl, SYS_RES_MEMORY, i,
 			    reg[i].sbr_offset, reg[i].sbr_offset +
 			    reg[i].sbr_size, reg[i].sbr_size);
-		free(reg, M_OFWPROP);
+		OF_prop_free(reg);
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev == NULL) {
 			device_printf(dev, "<%s>: device_add_child failed\n",