summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-10-12 01:09:46 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-10-12 01:09:46 +0000
commitfd4371e84bfe456363d8522471f8e03b42c3f36e (patch)
treea45b0b37f4702c1340cc44dce62c3b2b2e2ea809
parentc7bb58ffd3ad6fc8b402a37bee511cb1b92325de (diff)
Remove more '\n's from panic() statements. Both trailing and leading.
Diff generated by Chris Kuethe.
-rw-r--r--sys/arch/alpha/alpha/dec_1000a.c4
-rw-r--r--sys/arch/amiga/amiga/pmap.c4
-rw-r--r--sys/arch/hp300/hp300/pmap_bootstrap.c4
-rw-r--r--sys/arch/i386/i386/pmap.c4
-rw-r--r--sys/arch/m68k/m68k/pmap_motorola.c4
-rw-r--r--sys/arch/mac68k/mac68k/pmap_bootstrap.c4
-rw-r--r--sys/arch/mac68k/mac68k/trap.c4
-rw-r--r--sys/arch/macppc/macppc/ofw_machdep.c4
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c12
-rw-r--r--sys/arch/mvme68k/dev/if_ie.c6
-rw-r--r--sys/arch/mvme68k/dev/if_le.c6
-rw-r--r--sys/arch/mvme68k/mvme68k/pmap_bootstrap.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/bus_space.c4
-rw-r--r--sys/arch/sparc/dev/cgfourteen.c6
-rw-r--r--sys/arch/sparc/dev/isp_sbus.c6
-rw-r--r--sys/arch/sparc/dev/si.c4
-rw-r--r--sys/arch/sparc/dev/tcx.c4
-rw-r--r--sys/arch/sparc/dev/vigra.c4
-rw-r--r--sys/arch/sparc64/dev/iommu.c4
-rw-r--r--sys/arch/sparc64/dev/psycho.c4
-rw-r--r--sys/arch/sparc64/dev/zs.c4
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c4
-rw-r--r--sys/arch/sparc64/sparc64/clock.c6
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c4
-rw-r--r--sys/arch/sparc64/sparc64/trap.c4
-rw-r--r--sys/arch/sparc64/stand/ofwboot/Locore.c4
-rw-r--r--sys/arch/vax/if/if_qe.c4
-rw-r--r--sys/arch/vax/if/sgec.c4
-rw-r--r--sys/arch/vax/vax/ka670.c4
-rw-r--r--sys/arch/vax/vax/sgmap.c4
-rw-r--r--sys/dev/ata/ata_wdc.c4
-rw-r--r--sys/dev/cardbus/if_fxp_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_rl_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_xl_cardbus.c4
-rw-r--r--sys/dev/i2o/iopsp.c4
-rw-r--r--sys/dev/ieee1394/fwnode.c6
-rw-r--r--sys/dev/mii/mii.c4
-rw-r--r--sys/dev/pci/pciide.c4
-rw-r--r--sys/dev/pci/tga.c12
-rw-r--r--sys/dev/pci/ubsec.c10
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c16
-rw-r--r--sys/dev/sbus/isp_sbus.c6
-rw-r--r--sys/dev/tc/tcds.c6
-rw-r--r--sys/dev/usb/ohci.c16
-rw-r--r--sys/dev/usb/uhci.c14
-rw-r--r--sys/dev/usb/ulpt.c4
-rw-r--r--sys/dev/usb/umass.c18
-rw-r--r--sys/dev/usb/usbdi.c4
-rw-r--r--sys/dev/wscons/wsdisplay.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100.c4
-rw-r--r--sys/dev/wscons/wsmux.c6
-rw-r--r--sys/dev/wsfont/wsfont.c4
-rw-r--r--sys/kern/subr_pool.c8
-rw-r--r--sys/kern/uipc_socket2.c4
-rw-r--r--sys/netinet6/icmp6.c4
-rw-r--r--sys/netinet6/in6_cksum.c6
-rw-r--r--sys/netinet6/nd6.c16
-rw-r--r--sys/ufs/ext2fs/ext2fs_lookup.c4
-rw-r--r--sys/ufs/ffs/ffs_softdep.c6
-rw-r--r--sys/uvm/uvm_page.c6
-rw-r--r--sys/uvm/uvm_swap.c4
61 files changed, 177 insertions, 177 deletions
diff --git a/sys/arch/alpha/alpha/dec_1000a.c b/sys/arch/alpha/alpha/dec_1000a.c
index f63a127c3cf..109ddedbb80 100644
--- a/sys/arch/alpha/alpha/dec_1000a.c
+++ b/sys/arch/alpha/alpha/dec_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_1000a.c,v 1.1 2002/06/30 16:24:37 miod Exp $ */
+/* $OpenBSD: dec_1000a.c,v 1.2 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: dec_1000a.c,v 1.14 2001/06/05 04:53:11 thorpej Exp $ */
/*
@@ -235,7 +235,7 @@ dec_1000a_cons_init()
printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
- panic("consinit: unknown console type %ld\n",
+ panic("consinit: unknown console type %ld",
ctb->ctb_term_type);
}
#ifdef KGDB
diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index a2debb1fba8..c3871b2ddb2 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.50 2002/09/10 18:29:43 art Exp $ */
+/* $OpenBSD: pmap.c,v 1.51 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $ */
/*-
@@ -518,7 +518,7 @@ pmap_init()
* and we overran the page table map.
*/
bogons:
- panic("pmap_init: bogons in the VM system!\n");
+ panic("pmap_init: bogons in the VM system!");
}
#ifdef DEBUG
if (pmapdebug & PDB_INIT) {
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c
index 5278c9dc12c..963d048210f 100644
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.16 2002/02/23 04:58:25 miod Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.17 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */
/*
@@ -129,5 +129,5 @@ pmap_init_md()
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM,
UVM_FLAG_FIXED)))
- panic("pmap_init: bogons in the VM system!\n");
+ panic("pmap_init: bogons in the VM system!");
}
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 84e751fc2a7..b4cd69592ac 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.63 2002/09/11 22:39:00 art Exp $ */
+/* $OpenBSD: pmap.c,v 1.64 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $ */
/*
@@ -655,7 +655,7 @@ pmap_kremove(va, len)
pte = vtopte(va);
#ifdef DIAGNOSTIC
if (*pte & PG_PVLIST)
- panic("pmap_kremove: PG_PVLIST mapping for 0x%lx\n",
+ panic("pmap_kremove: PG_PVLIST mapping for 0x%lx",
va);
#endif
*pte = 0; /* zap! */
diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c
index 20afbbbb606..66c162fd2e7 100644
--- a/sys/arch/m68k/m68k/pmap_motorola.c
+++ b/sys/arch/m68k/m68k/pmap_motorola.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_motorola.c,v 1.20 2002/09/10 18:29:43 art Exp $ */
+/* $OpenBSD: pmap_motorola.c,v 1.21 2002/10/12 01:09:43 krw Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -419,7 +419,7 @@ pmap_init()
* portion of the kernel page table isn't big enough
* and we overran the page table map.
*/
- panic("pmap_init: bogons in the VM system!\n");
+ panic("pmap_init: bogons in the VM system!");
}
PMAP_DPRINTF(PDB_INIT,
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index 7fa50d88db2..5b11571d06b 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.23 2002/04/27 01:52:13 miod Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.24 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */
/*
@@ -296,5 +296,5 @@ pmap_init_md()
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM,
UVM_FLAG_FIXED)))
- panic("pmap_init: bogons in the VM system!\n");
+ panic("pmap_init: bogons in the VM system!");
}
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 383f981d1d8..d6551bc7d0e 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.38 2002/06/23 03:03:15 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.39 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */
/*
@@ -256,7 +256,7 @@ trap(type, code, v, frame)
p = &proc0;
#ifdef DIAGNOSTIC
if (p->p_addr == NULL)
- panic("trap: type 0x%x, code 0x%x, v 0x%x -- no pcb\n",
+ panic("trap: type 0x%x, code 0x%x, v 0x%x -- no pcb",
type, code, v);
#endif
diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c
index 5cc42375c51..233c97d7600 100644
--- a/sys/arch/macppc/macppc/ofw_machdep.c
+++ b/sys/arch/macppc/macppc/ofw_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofw_machdep.c,v 1.16 2002/09/15 09:01:58 deraadt Exp $ */
+/* $OpenBSD: ofw_machdep.c,v 1.17 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -544,7 +544,7 @@ of_display_console()
len = OF_getprop(display_node, "assigned-addresses",
addr, sizeof(addr));
if (len < sizeof(addr[0])) {
- panic(": no address\n");
+ panic(": no address");
}
}
len = OF_getprop(display_node, "backlight-control",
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index d7e3d994f17..5bc2fd27166 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.15 2002/10/07 05:39:48 drahn Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.16 2002/10/12 01:09:43 krw Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -239,7 +239,7 @@ mpcpcibrattach(parent, self, aux)
if ( bus_space_map(&(sc->sc_iobus_space), 0, NBPG, 0,
&lcp->ioh_cf8) != 0 )
{
- panic("mpcpcibus: unable to map self\n");
+ panic("mpcpcibus: unable to map self");
}
lcp->ioh_cfc = lcp->ioh_cf8;
} else {
@@ -252,12 +252,12 @@ mpcpcibrattach(parent, self, aux)
if ( bus_space_map(&(sc->sc_iobus_space), 0xfec00000,
NBPG, 0, &lcp->ioh_cf8) != 0 )
{
- panic("mpcpcibus: unable to map self\n");
+ panic("mpcpcibus: unable to map self");
}
if ( bus_space_map(&(sc->sc_iobus_space), 0xfee00000,
NBPG, 0, &lcp->ioh_cfc) != 0 )
{
- panic("mpcpcibus: unable to map self\n");
+ panic("mpcpcibus: unable to map self");
}
}
@@ -462,12 +462,12 @@ mpcpcibrattach(parent, self, aux)
if ( bus_space_map(&(sc->sc_iobus_space), addr_offset,
NBPG, 0, &lcp->ioh_cf8) != 0 )
{
- panic("mpcpcibus: unable to map self\n");
+ panic("mpcpcibus: unable to map self");
}
if ( bus_space_map(&(sc->sc_iobus_space), data_offset,
NBPG, 0, &lcp->ioh_cfc) != 0 )
{
- panic("mpcpcibus: unable to map self\n");
+ panic("mpcpcibus: unable to map self");
}
of_node = ca->ca_node;
diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c
index 6dc8599c8d2..e5e58cd9d9a 100644
--- a/sys/arch/mvme68k/dev/if_ie.c
+++ b/sys/arch/mvme68k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.19 2002/04/27 23:21:05 miod Exp $ */
+/* $OpenBSD: if_ie.c,v 1.20 2002/10/12 01:09:43 krw Exp $ */
/*-
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -1398,7 +1398,7 @@ iereset(sc)
#ifdef notdef
if (!check_ie_present(sc, sc->sc_maddr, sc->sc_msize))
- panic("ie disappeared!\n");
+ panic("ie disappeared!");
#endif
sc->sc_arpcom.ac_if.if_flags |= IFF_UP;
@@ -1584,7 +1584,7 @@ setup_bufs(sc)
sc->nframes = n / r;
if (sc->nframes <= 0)
- panic("ie: bogus buffer calc\n");
+ panic("ie: bogus buffer calc");
if (sc->nframes > MXFRAMES)
sc->nframes = MXFRAMES;
diff --git a/sys/arch/mvme68k/dev/if_le.c b/sys/arch/mvme68k/dev/if_le.c
index d713a73fb85..19174504720 100644
--- a/sys/arch/mvme68k/dev/if_le.c
+++ b/sys/arch/mvme68k/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.19 2002/04/29 06:26:50 pvalchev Exp $ */
+/* $OpenBSD: if_le.c,v 1.20 2002/10/12 01:09:43 krw Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -339,7 +339,7 @@ leattach(parent, self, aux)
}
sc->sc_mem = (void *)mapiodev(addr, VLEMEMSIZE);
if (sc->sc_mem == NULL)
- panic("\nle: no more memory in external I/O map\n");
+ panic("le: no more memory in external I/O map");
lesc->sc_r1 = (void *)ca->ca_vaddr;
lesc->sc_ipl = ca->ca_ipl;
lesc->sc_vec = ca->ca_vec;
@@ -377,7 +377,7 @@ leattach(parent, self, aux)
myetheraddr(sc->sc_arpcom.ac_enaddr);
break;
default:
- panic("\nle: unknown bus type.\n");
+ panic("le: unknown bus type.");
}
evcnt_attach(&sc->sc_dev, "intr", &lesc->sc_intrcnt);
evcnt_attach(&sc->sc_dev, "errs", &lesc->sc_errcnt);
diff --git a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
index f8ae7787af2..22ab88aa71d 100644
--- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.15 2002/02/23 04:58:28 miod Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.16 2002/10/12 01:09:43 krw Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -156,5 +156,5 @@ pmap_init_md()
NULL, UVM_UNKNOWN_OFFSET, 0,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM, UVM_FLAG_FIXED)))
- panic("pmap_init: bogons in the VM system!\n");
+ panic("pmap_init: bogons in the VM system!");
}
diff --git a/sys/arch/mvmeppc/mvmeppc/bus_space.c b/sys/arch/mvmeppc/mvmeppc/bus_space.c
index 560b1c9798f..9ab3036642c 100644
--- a/sys/arch/mvmeppc/mvmeppc/bus_space.c
+++ b/sys/arch/mvmeppc/mvmeppc/bus_space.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_space.c,v 1.4 2001/07/06 05:14:30 smurph Exp $ */
+/* $OpenBSD: bus_space.c,v 1.5 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: bus_space.c,v 1.4 2001/06/15 15:50:05 nonaka Exp $ */
/*-
@@ -88,7 +88,7 @@ prep_bus_space_init()
EX_NOCOALESCE|EX_NOWAIT);
error = extent_alloc_region(ioport_ex, 0x10000, 0x7F0000, EX_NOWAIT);
if (error)
- panic("prep_bus_space_init: can't block out reserved I/O space 0x10000-0x7fffff: error=%d\n", error);
+ panic("prep_bus_space_init: can't block out reserved I/O space 0x10000-0x7fffff: error=%d", error);
iomem_ex = extent_create("iomem", 0, 0x3effffff, M_DEVBUF,
(caddr_t)iomem_ex_storage, sizeof(iomem_ex_storage),
EX_NOCOALESCE|EX_NOWAIT);
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 9f84523314b..74c59f8d931 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgfourteen.c,v 1.17 2002/10/01 07:09:59 miod Exp $ */
+/* $OpenBSD: cgfourteen.c,v 1.18 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
/*
@@ -246,10 +246,10 @@ cgfourteenattach(parent, self, args)
* Sanity checks
*/
if (ca->ca_ra.ra_len < 0x10000)
- panic("\ncgfourteen: expected %x bytes of control "
+ panic("cgfourteen: expected %x bytes of control "
"registers, got %x", 0x10000, ca->ca_ra.ra_len);
if (ca->ca_ra.ra_nreg < CG14_NREG)
- panic("\ncgfourteen: expected %d registers, got %d",
+ panic("cgfourteen: expected %d registers, got %d",
CG14_NREG, ca->ca_ra.ra_nreg);
printf(", %dMB", ca->ca_ra.ra_reg[CG14_REG_VRAM].rr_len >> 20);
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index a77f1174df0..320ac148043 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.22 2002/05/17 01:19:00 mjacob Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.23 2002/10/12 01:09:43 krw Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -412,7 +412,7 @@ isp_sbus_dmasetup(struct ispsoftc *isp, struct scsi_xfer *xs, ispreq_t *rq,
}
if (sbc->sbus_kdma_allocs[isp_handle_index(rq->req_handle)] != 0) {
- panic("%s: kdma handle already allocated\n", isp->isp_name);
+ panic("%s: kdma handle already allocated", isp->isp_name);
/* NOTREACHED */
}
if (XS_CDBLEN(xs) > 12) {
@@ -468,7 +468,7 @@ isp_sbus_dmateardown(struct ispsoftc *isp, XS_T *xs, u_int16_t handle)
cpuinfo.cache_flush(xs->data, xs->datalen - xs->resid);
}
if (sbc->sbus_kdma_allocs[isp_handle_index(handle)] == (vaddr_t) 0) {
- panic("%s: kdma handle not already allocated\n", isp->isp_name);
+ panic("%s: kdma handle not already allocated", isp->isp_name);
/* NOTREACHED */
}
kdvma = sbc->sbus_kdma_allocs[isp_handle_index(handle)];
diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c
index fcef08c2cd0..7e50b671bdd 100644
--- a/sys/arch/sparc/dev/si.c
+++ b/sys/arch/sparc/dev/si.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: si.c,v 1.17 2002/04/30 01:12:29 art Exp $ */
+/* $OpenBSD: si.c,v 1.18 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */
/*-
@@ -408,7 +408,7 @@ si_attach(parent, self, args)
break;
default:
- panic("\nsi_attach: impossible bus type 0x%x", ca->ca_bustype);
+ panic("si_attach: impossible bus type 0x%x", ca->ca_bustype);
/* NOTREACHED */
}
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index a4343fd118b..bcf34bfbc12 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcx.c,v 1.12 2002/10/01 20:55:14 miod Exp $ */
+/* $OpenBSD: tcx.c,v 1.13 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
/*
@@ -218,7 +218,7 @@ tcxattach(parent, self, args)
sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
if (ca->ca_ra.ra_nreg < TCX_NREG)
- panic("\ntcx: expected %d registers, got %d", TCX_NREG,
+ panic("tcx: expected %d registers, got %d", TCX_NREG,
ca->ca_ra.ra_nreg);
/* Copy register address spaces */
diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c
index 7ab91b8fb8e..631e98eaa64 100644
--- a/sys/arch/sparc/dev/vigra.c
+++ b/sys/arch/sparc/dev/vigra.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vigra.c,v 1.3 2002/09/23 18:13:39 miod Exp $ */
+/* $OpenBSD: vigra.c,v 1.4 2002/10/12 01:09:43 krw Exp $ */
/*
* Copyright (c) 2002 Miodrag Vallat. All rights reserved.
@@ -207,7 +207,7 @@ vigraattach(parent, self, args)
isconsole = node == fbnode;
if (ca->ca_ra.ra_nreg < VIGRA_NREG)
- panic("\nexpected %d registers, got %d",
+ panic("expected %d registers, got %d",
VIGRA_NREG, ca->ca_ra.ra_nreg);
sc->sc_regs = mapiodev(&ca->ca_ra.ra_reg[VIGRA_REG_G300], 0,
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 2c318127894..e3829d1763e 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iommu.c,v 1.22 2002/10/07 18:35:56 mickey Exp $ */
+/* $OpenBSD: iommu.c,v 1.23 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
@@ -310,7 +310,7 @@ iommu_tsb_entry(is, dva)
tte = is->is_tsb[IOTSBSLOT(dva,is->is_tsbsize)];
if ((tte & IOTTE_V) == 0)
- panic("iommu_tsb_entry: invalid entry %llx\n", (long long)dva);
+ panic("iommu_tsb_entry: invalid entry %llx", (long long)dva);
return (tte);
}
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 80af946f572..4488c214e32 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: psycho.c,v 1.22 2002/09/17 13:25:52 art Exp $ */
+/* $OpenBSD: psycho.c,v 1.23 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */
/*
@@ -614,7 +614,7 @@ psycho_ue(arg)
/*
* It's uncorrectable. Dump the regs and panic.
*/
- panic("%s: uncorrectable DMA error AFAR %llx (pa=%llx) AFSR %llx\n",
+ panic("%s: uncorrectable DMA error AFAR %llx (pa=%llx) AFSR %llx",
sc->sc_dev.dv_xname, afar,
(long long)iommu_extract(sc->sc_is, (vaddr_t)afar), afsr);
return (1);
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index 87e2a27dd1f..cdc35cb99a1 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.10 2002/09/23 18:43:18 jason Exp $ */
+/* $OpenBSD: zs.c,v 1.11 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -377,7 +377,7 @@ zs_attach(zsc, zsd, pri)
*/
bus_intr_establish(zsc->zsc_bustag, pri, IPL_SERIAL, 0, zshard, zsc);
if (!(zsc->zsc_softintr = softintr_establish(softpri, zssoft, zsc)))
- panic("zsattach: could not establish soft interrupt\n");
+ panic("zsattach: could not establish soft interrupt");
evcnt_attach(&zsc->zsc_dev, "intr", &zsc->zsc_intrcnt);
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 44f9b36072d..41a44173bec 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.26 2002/09/04 18:25:31 jason Exp $ */
+/* $OpenBSD: autoconf.c,v 1.27 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -1067,7 +1067,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
}
}
if (node == 0)
- panic("None of the CPUs found\n");
+ panic("None of the CPUs found");
}
diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index e90738b007c..110652d6b60 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.13 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: clock.c,v 1.14 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
/*
@@ -321,7 +321,7 @@ sbus_wenable(handle, onoff)
8192, prot, (vaddr_t)sbi->si_bh, &newaddr);
/* We can panic now or take a datafault later... */
if (sbi->si_bh != newaddr)
- panic("sbus_wenable: address %p changed to %p\n",
+ panic("sbus_wenable: address %p changed to %p",
(void *)(u_long)sbi->si_bh,
(void *)(u_long)newaddr);
}
@@ -397,7 +397,7 @@ ebus_wenable(handle, onoff)
(vaddr_t)ebi->ei_bh, &newaddr);
/* We can panic now or take a datafault later... */
if (ebi->ei_bh != newaddr)
- panic("ebus_wenable: address %p changed to %p\n",
+ panic("ebus_wenable: address %p changed to %p",
(void *)(u_long)ebi->ei_bh,
(void *)(u_long)newaddr);
}
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index a35fe12e347..b272919b5da 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.50 2002/10/07 18:35:57 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.51 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -1792,7 +1792,7 @@ sparc_bus_map(t, iospace, addr, size, flags, vaddr, hp)
if ((err = extent_alloc(io_space, size, NBPG,
0, 0, EX_NOWAIT|EX_BOUNDZERO,
(u_long *)&v)))
- panic("sparc_bus_map: cannot allocate io_space: %d\n", err);
+ panic("sparc_bus_map: cannot allocate io_space: %d", err);
}
/* note: preserve page offset */
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index af3d4a395ae..5c8f0273ceb 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.22 2002/07/24 00:48:25 art Exp $ */
+/* $OpenBSD: trap.c,v 1.23 2002/10/12 01:09:43 krw Exp $ */
/* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
/*
@@ -1006,7 +1006,7 @@ text_access_fault(tf, type, pc, sfsr)
uvmexp.traps++;
if ((p = curproc) == NULL) /* safety check */
- panic("text_access_fault: no curproc\n");
+ panic("text_access_fault: no curproc");
sticks = p->p_sticks;
tstate = tf->tf_tstate;
diff --git a/sys/arch/sparc64/stand/ofwboot/Locore.c b/sys/arch/sparc64/stand/ofwboot/Locore.c
index ba9d8626e8d..e06f9412bff 100644
--- a/sys/arch/sparc64/stand/ofwboot/Locore.c
+++ b/sys/arch/sparc64/stand/ofwboot/Locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: Locore.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */
+/* $OpenBSD: Locore.c,v 1.5 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: Locore.c,v 1.1 2000/08/20 14:58:36 mrg Exp $ */
/*
@@ -408,7 +408,7 @@ OF_chain(virt, size, entry, arg, len)
(unsigned long)romp, (unsigned long)romp);
}
entry(0, arg, len, (unsigned long)romp, (unsigned long)romp);
- panic("OF_chain: kernel returned!\n");
+ panic("OF_chain: kernel returned!");
__asm("ta 2" : :);
}
diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c
index 8f0e7756aed..8b2088a5b6e 100644
--- a/sys/arch/vax/if/if_qe.c
+++ b/sys/arch/vax/if/if_qe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_qe.c,v 1.13 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: if_qe.c,v 1.14 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: if_qe.c,v 1.39 2000/01/24 02:40:29 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -767,7 +767,7 @@ qe_add_rxbuf(sc, i)
error = bus_dmamap_load(sc->sc_dmat, sc->sc_rcvmap[i],
m->m_ext.ext_buf, m->m_ext.ext_size, NULL, BUS_DMA_NOWAIT);
if (error)
- panic("%s: can't load rx DMA map %d, error = %d\n",
+ panic("%s: can't load rx DMA map %d, error = %d",
sc->sc_dev.dv_xname, i, error);
sc->sc_rxmbuf[i] = m;
diff --git a/sys/arch/vax/if/sgec.c b/sys/arch/vax/if/sgec.c
index b4ddacb25ae..a53095fe22b 100644
--- a/sys/arch/vax/if/sgec.c
+++ b/sys/arch/vax/if/sgec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgec.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: sgec.c,v 1.5 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: sgec.c,v 1.5 2000/06/04 02:14:14 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -593,7 +593,7 @@ ze_add_rxbuf(sc, i)
error = bus_dmamap_load(sc->sc_dmat, sc->sc_rcvmap[i],
m->m_ext.ext_buf, m->m_ext.ext_size, NULL, BUS_DMA_NOWAIT);
if (error)
- panic("%s: can't load rx DMA map %d, error = %d\n",
+ panic("%s: can't load rx DMA map %d, error = %d",
sc->sc_dev.dv_xname, i, error);
sc->sc_rxmbuf[i] = m;
diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c
index 57021664e81..4d257a6d070 100644
--- a/sys/arch/vax/vax/ka670.c
+++ b/sys/arch/vax/vax/ka670.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka670.c,v 1.6 2002/09/28 06:25:11 hugh Exp $ */
+/* $OpenBSD: ka670.c,v 1.7 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
@@ -140,7 +140,7 @@ ka670_mchk(addr)
*/
if (mfpr(PR_PCSTS) & KA670_PCS_TRAP2) {
printf("TRAP2 (double error) in ka670_mchk.\n");
- panic("unrecoverable state in ka670_mchk.\n");
+ panic("unrecoverable state in ka670_mchk.");
return (-1);
}
if ((mcf->mc670_code & KA670_MC_RESTART) ||
diff --git a/sys/arch/vax/vax/sgmap.c b/sys/arch/vax/vax/sgmap.c
index b5909f7e39f..be3ea70f93d 100644
--- a/sys/arch/vax/vax/sgmap.c
+++ b/sys/arch/vax/vax/sgmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgmap.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */
+/* $OpenBSD: sgmap.c,v 1.7 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: sgmap.c,v 1.8 2000/06/29 07:14:34 mrg Exp $ */
/*-
@@ -91,7 +91,7 @@ vax_sgmap_init(t, sgmap, name, sgvabase, sgvasize, ptva, minptalign)
minptalign = ptsize;
if (bus_dmamem_alloc(t, ptsize, minptalign, 0, &seg, 1, &rseg,
BUS_DMA_NOWAIT)) {
- panic("unable to allocate page table for sgmap `%s'\n",
+ panic("unable to allocate page table for sgmap `%s'",
name);
goto die;
}
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 632a0b017f5..ab713fbc801 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ata_wdc.c,v 1.15 2002/05/03 09:18:46 gluk Exp $ */
+/* $OpenBSD: ata_wdc.c,v 1.16 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $ */
/*
@@ -413,7 +413,7 @@ wdc_ata_bio_intr(chp, xfer, irq)
printf("%s:%d:%d: bad state %d in wdc_ata_bio_intr\n",
chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive,
drvp->state);
- panic("wdc_ata_bio_intr: bad state\n");
+ panic("wdc_ata_bio_intr: bad state");
}
/*
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 9d66f4208f7..919b5601eaf 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_fxp_cardbus.c,v 1.4 2002/03/14 01:26:53 millert Exp $ */
+/* $OpenBSD: if_fxp_cardbus.c,v 1.5 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */
/*
@@ -245,7 +245,7 @@ fxp_cardbus_detach(self, flags)
#ifdef DIAGNOSTIC
if (ct == NULL)
- panic("%s: data structure lacks\n", sc->sc_dev.dv_xname);
+ panic("%s: data structure lacks", sc->sc_dev.dv_xname);
#endif
rv = fxp_detach(sc);
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index c86581af17e..daa7e388ca5 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rl_cardbus.c,v 1.2 2002/06/08 10:01:38 jason Exp $ */
+/* $OpenBSD: if_rl_cardbus.c,v 1.3 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */
/*
@@ -255,7 +255,7 @@ rl_cardbus_detach(self, flags)
#ifdef DIAGNOSTIC
if (ct == NULL)
- panic("%s: data structure lacks\n", sc->sc_dev.dv_xname);
+ panic("%s: data structure lacks", sc->sc_dev.dv_xname);
#endif
rv = rl_detach(sc);
if (rv)
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 32da1f2c93b..5b2fae38583 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xl_cardbus.c,v 1.11 2002/06/15 05:14:41 aaron Exp $ */
+/* $OpenBSD: if_xl_cardbus.c,v 1.12 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */
/*
@@ -325,7 +325,7 @@ xl_cardbus_detach(self, arg)
#if defined(DIAGNOSTIC)
if (ct == NULL) {
- panic("%s: data structure lacks\n", sc->sc_dev.dv_xname);
+ panic("%s: data structure lacks", sc->sc_dev.dv_xname);
}
#endif
diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c
index 4853d52d7fa..91310f16f30 100644
--- a/sys/dev/i2o/iopsp.c
+++ b/sys/dev/i2o/iopsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iopsp.c,v 1.5 2002/03/14 01:26:53 millert Exp $ */
+/* $OpenBSD: iopsp.c,v 1.6 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD$ */
/*-
@@ -455,7 +455,7 @@ iopsp_scsi_cmd(xs)
#if defined(I2ODEBUG) || defined(SCSIDEBUG)
if (xs->cmdlen > sizeof(mf->cdb))
- panic("%s: CDB too large\n", sc->sc_dv.dv_xname);
+ panic("%s: CDB too large", sc->sc_dv.dv_xname);
#endif
im = iop_msg_alloc(iop, &sc->sc_ii, IM_POLL_INTR |
diff --git a/sys/dev/ieee1394/fwnode.c b/sys/dev/ieee1394/fwnode.c
index c091f9c36ed..4e822217f45 100644
--- a/sys/dev/ieee1394/fwnode.c
+++ b/sys/dev/ieee1394/fwnode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fwnode.c,v 1.2 2002/06/26 14:04:02 tdeval Exp $ */
+/* $OpenBSD: fwnode.c,v 1.3 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: fwnode.c,v 1.13 2002/04/03 04:15:59 jmc Exp $ */
/*
@@ -198,7 +198,7 @@ fwnode_configrom_input(struct ieee1394_abuf *ab, int rcode)
if (ab->ab_cbarg != NULL) {
cc = (struct cfgrom_cbarg *) ab->ab_cbarg;
if (cc->cc_type != 0x31333934)
- panic("Got an invalid abuf on callback\n");
+ panic("Got an invalid abuf on callback");
DPRINTF(("(cc_num:%d/0x%02x) ", cc->cc_num, cc->cc_num));
}
@@ -286,7 +286,7 @@ fwnode_configrom_input(struct ieee1394_abuf *ab, int rcode)
#ifdef DIAGNOSTIC
if (ab->ab_retlen < (ab->ab_length / 4))
- panic("Configrom shrank during iscomplete check?\n");
+ panic("Configrom shrank during iscomplete check?");
#endif
if (ab->ab_retlen > (ab->ab_length / 4)) {
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 757dcd7fcd0..8bc95c8acab 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mii.c,v 1.11 2002/03/14 01:26:57 millert Exp $ */
+/* $OpenBSD: mii.c,v 1.12 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: mii.c,v 1.19 2000/02/02 17:09:44 thorpej Exp $ */
/*-
@@ -190,7 +190,7 @@ mii_activate(mii, act, phyloc, offloc)
case DVACT_DEACTIVATE:
if (config_deactivate(&child->mii_dev) != 0)
- panic("%s: config_activate(%d) failed\n",
+ panic("%s: config_activate(%d) failed",
child->mii_dev.dv_xname, act);
}
}
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 136e9ffc7d8..6ba5109d8f1 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.91 2002/09/09 17:45:26 gluk Exp $ */
+/* $OpenBSD: pciide.c,v 1.92 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -938,7 +938,7 @@ pciide_compat_intr(arg)
#ifdef DIAGNOSTIC
/* should only be called for a compat channel */
if (cp->compat == 0)
- panic("pciide compat intr called for non-compat chan %p\n", cp);
+ panic("pciide compat intr called for non-compat chan %p", cp);
#endif
return (wdcintr(&cp->wdc_channel));
}
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index c3a59ccb312..12f7d978568 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.17 2002/07/04 00:34:28 miod Exp $ */
+/* $OpenBSD: tga.c,v 1.18 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */
/*
@@ -1461,7 +1461,7 @@ tga_ramdac_wr(v, btreg, val)
struct tga_devconfig *dc = v;
if (btreg > BT485_REG_MAX)
- panic("tga_ramdac_wr: reg %d out of range\n", btreg);
+ panic("tga_ramdac_wr: reg %d out of range", btreg);
TGAWREG(dc, TGA_REG_EPDR, (btreg << 9) | (0 << 8 ) | val); /* XXX */
TGAREGWB(dc, TGA_REG_EPDR, 1);
@@ -1477,7 +1477,7 @@ tga2_ramdac_wr(v, btreg, val)
bus_space_handle_t ramdac;
if (btreg > BT485_REG_MAX)
- panic("tga_ramdac_wr: reg %d out of range\n", btreg);
+ panic("tga_ramdac_wr: reg %d out of range", btreg);
bus_space_subregion(dc->dc_memt, dc->dc_memh, TGA2_MEM_RAMDAC +
(0xe << 12) + (btreg << 8), 4, &ramdac);
@@ -1548,7 +1548,7 @@ tga_ramdac_rd(v, btreg)
tga_reg_t rdval;
if (btreg > BT485_REG_MAX)
- panic("tga_ramdac_rd: reg %d out of range\n", btreg);
+ panic("tga_ramdac_rd: reg %d out of range", btreg);
TGAWREG(dc, TGA_REG_EPSR, (btreg << 1) | 0x1); /* XXX */
TGAREGWB(dc, TGA_REG_EPSR, 1);
@@ -1567,7 +1567,7 @@ tga2_ramdac_rd(v, btreg)
u_int8_t retval;
if (btreg > BT485_REG_MAX)
- panic("tga_ramdac_rd: reg %d out of range\n", btreg);
+ panic("tga_ramdac_rd: reg %d out of range", btreg);
bus_space_subregion(dc->dc_memt, dc->dc_memh, TGA2_MEM_RAMDAC +
(0xe << 12) + (btreg << 8), 4, &ramdac);
@@ -1677,7 +1677,7 @@ tga2_ics9110_wr(dc, dotclock)
case 14300000: /* this one is just a ref clock */
N = 0x03; M = 0x03; V = 0x1; X = 0x1; R = 0x3; break;
default:
- panic("unrecognized clock rate %d\n", dotclock);
+ panic("unrecognized clock rate %d", dotclock);
}
/* XXX -- hard coded, bad */
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 0cad2752ee6..d35d4ef0c99 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.117 2002/10/10 17:46:35 jason Exp $ */
+/* $OpenBSD: ubsec.c,v 1.118 2002/10/12 01:09:44 krw Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1970,10 +1970,10 @@ ubsec_kprocess_modexp_sw(sc, krp)
#ifdef DIAGNOSTIC
/* Misaligned output buffer will hang the chip. */
if ((letoh32(mcr->mcr_opktbuf.pb_addr) & 3) != 0)
- panic("%s: modexp invalid addr 0x%x\n",
+ panic("%s: modexp invalid addr 0x%x",
sc->sc_dv.dv_xname, letoh32(mcr->mcr_opktbuf.pb_addr));
if ((letoh32(mcr->mcr_opktbuf.pb_len) & 3) != 0)
- panic("%s: modexp invalid len 0x%x\n",
+ panic("%s: modexp invalid len 0x%x",
sc->sc_dv.dv_xname, letoh32(mcr->mcr_opktbuf.pb_len));
#endif
@@ -2172,10 +2172,10 @@ ubsec_kprocess_modexp_hw(sc, krp)
#ifdef DIAGNOSTIC
/* Misaligned output buffer will hang the chip. */
if ((letoh32(mcr->mcr_opktbuf.pb_addr) & 3) != 0)
- panic("%s: modexp invalid addr 0x%x\n",
+ panic("%s: modexp invalid addr 0x%x",
sc->sc_dv.dv_xname, letoh32(mcr->mcr_opktbuf.pb_addr));
if ((letoh32(mcr->mcr_opktbuf.pb_len) & 3) != 0)
- panic("%s: modexp invalid len 0x%x\n",
+ panic("%s: modexp invalid len 0x%x",
sc->sc_dv.dv_xname, letoh32(mcr->mcr_opktbuf.pb_len));
#endif
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index cd7e27fe9b2..0ba733a4133 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_netbsdkintf.c,v 1.9 2002/03/14 01:27:01 millert Exp $ */
+/* $OpenBSD: rf_netbsdkintf.c,v 1.10 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.93 2000/07/14 15:26:29 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -324,7 +324,7 @@ raidattach(num)
RF_Calloc(raidPtrs, num, sizeof(RF_Raid_t *), (RF_Raid_t **));
if (raidPtrs == NULL) {
- panic("raidPtrs is NULL!!\n");
+ panic("raidPtrs is NULL!!");
}
rc = rf_mutex_init(&rf_sparet_wait_mutex);
@@ -340,7 +340,7 @@ raidattach(num)
if (rc == 0)
printf("Kernelized RAIDframe activated\n");
else
- panic("Serious error booting RAID!!\n");
+ panic("Serious error booting RAID!!");
/* put together some datastructures like the CCD device does.. This
* lets us lock the device and what-not when it gets opened. */
@@ -358,7 +358,7 @@ raidattach(num)
raidrootdev = (struct device *)malloc(num * sizeof(struct device),
M_RAIDFRAME, M_NOWAIT);
if (raidrootdev == NULL) {
- panic("No memory for RAIDframe driver!!?!?!\n");
+ panic("No memory for RAIDframe driver!!?!?!");
}
for (raidID = 0; raidID < num; raidID++) {
@@ -1719,7 +1719,7 @@ rf_DispatchKernelIO(queue, req)
if (unit >= numraid) {
printf("Invalid unit number: %d %d\n", unit, numraid);
- panic("Invalid Unit number in rf_DispatchKernelIO\n");
+ panic("Invalid Unit number in rf_DispatchKernelIO");
}
rs = &raid_softc[unit];
@@ -1922,7 +1922,7 @@ InitBP(bp, b_vp, rw_flag, dev, startSect, numSect, buf, cbFunc, cbArg,
bp->b_blkno = startSect;
bp->b_resid = bp->b_bcount; /* XXX is this right!??!?!! */
if (bp->b_bcount == 0) {
- panic("bp->b_bcount is zero in InitBP!!\n");
+ panic("bp->b_bcount is zero in InitBP!!");
}
bp->b_proc = b_proc;
bp->b_iodone = cbFunc;
@@ -2815,7 +2815,7 @@ rf_create_auto_sets(ac_list)
malloc(sizeof(RF_ConfigSet_t),
M_RAIDFRAME, M_NOWAIT);
if (config_sets == NULL) {
- panic("rf_create_auto_sets: No memory!\n");
+ panic("rf_create_auto_sets: No memory!");
}
/* this one is easy :) */
config_sets->ac = ac;
@@ -2840,7 +2840,7 @@ rf_create_auto_sets(ac_list)
malloc(sizeof(RF_ConfigSet_t),
M_RAIDFRAME, M_NOWAIT);
if (cset == NULL) {
- panic("rf_create_auto_sets: No memory!\n");
+ panic("rf_create_auto_sets: No memory!");
}
cset->ac = ac;
ac->next = NULL;
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index 4c30067df86..391f8bfd1b5 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.3 2002/05/17 01:19:49 mjacob Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.4 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: isp_sbus.c,v 1.46 2001/09/26 20:53:14 eeh Exp $ */
/*
@@ -525,7 +525,7 @@ isp_sbus_dmasetup(struct ispsoftc *isp, XS_T *xs, ispreq_t *rq,
dmap = sbc->sbus_dmamap[isp_handle_index(rq->req_handle)];
if (dmap->dm_nsegs != 0) {
- panic("%s: dma map already allocated\n", isp->isp_name);
+ panic("%s: dma map already allocated", isp->isp_name);
/* NOTREACHED */
}
if (bus_dmamap_load(isp->isp_dmatag, dmap, xs->data, xs->datalen,
@@ -590,7 +590,7 @@ isp_sbus_dmateardown(struct ispsoftc *isp, XS_T *xs, u_int16_t handle)
dmap = sbc->sbus_dmamap[isp_handle_index(handle)];
if (dmap->dm_nsegs == 0) {
- panic("%s: dma map not already allocated\n", isp->isp_name);
+ panic("%s: dma map not already allocated", isp->isp_name);
/* NOTREACHED */
}
bus_dmamap_sync(isp->isp_dmatag, dmap, 0,
diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c
index a69e5c7805f..3098e0deb6e 100644
--- a/sys/dev/tc/tcds.c
+++ b/sys/dev/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcds.c,v 1.1 2002/05/02 22:56:06 miod Exp $ */
+/* $OpenBSD: tcds.c,v 1.2 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: tcds.c,v 1.3 2001/11/13 06:26:10 lukem Exp $ */
/*-
@@ -176,7 +176,7 @@ tcdsattach(parent, self, aux)
td = tcds_lookup(ta->ta_modname);
if (td == NULL)
- panic("\ntcdsattach: impossible");
+ panic("tcdsattach: impossible");
printf(": TurboChannel Dual SCSI");
if (td->td_flags & TCDSF_BASEBOARD)
@@ -394,7 +394,7 @@ tcds_intrnull(val)
void *val;
{
- panic("tcds_intrnull: uncaught TCDS intr for chip %lu\n",
+ panic("tcds_intrnull: uncaught TCDS intr for chip %lu",
(u_long)val);
}
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 0dd75bbc0a6..dc9f3aa1084 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.31 2002/08/07 18:57:00 mickey Exp $ */
+/* $OpenBSD: ohci.c,v 1.32 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: ohci.c,v 1.104 2001/09/28 23:57:21 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -510,7 +510,7 @@ ohci_alloc_std_chain(struct ohci_pipe *opipe, ohci_softc_t *sc,
curlen -= curlen % UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize);
#ifdef DIAGNOSTIC
if (curlen == 0)
- panic("ohci_alloc_std: curlen == 0\n");
+ panic("ohci_alloc_std: curlen == 0");
#endif
}
DPRINTFN(4,("ohci_alloc_std_chain: dataphys=0x%08x "
@@ -625,7 +625,7 @@ ohci_free_sitd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
#ifdef DIAGNOSTIC
if (!sitd->isdone) {
- panic("ohci_free_sitd: sitd=%p not done\n", sitd);
+ panic("ohci_free_sitd: sitd=%p not done", sitd);
return;
}
#endif
@@ -1227,7 +1227,7 @@ ohci_add_done(ohci_softc_t *sc, ohci_physaddr_t done)
DPRINTFN(5,("add ITD %p\n", sitd));
continue;
}
- panic("ohci_add_done: addr 0x%08lx not found\n", (u_long)done);
+ panic("ohci_add_done: addr 0x%08lx not found", (u_long)done);
}
/* sdone & sidone now hold the done lists. */
@@ -1389,7 +1389,7 @@ ohci_device_ctrl_done(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (!(xfer->rqflags & URQ_REQUEST)) {
- panic("ohci_ctrl_done: not a request\n");
+ panic("ohci_ctrl_done: not a request");
}
#endif
xfer->hcpriv = NULL;
@@ -1694,7 +1694,7 @@ ohci_rem_ed(ohci_soft_ed_t *sed, ohci_soft_ed_t *head)
for (p = head; p == NULL && p->next != sed; p = p->next)
;
if (p == NULL)
- panic("ohci_rem_ed: ED not found\n");
+ panic("ohci_rem_ed: ED not found");
p->next = sed->next;
p->ed.ed_nexted = sed->ed.ed_nexted;
}
@@ -2825,7 +2825,7 @@ ohci_device_intr_start(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (xfer->rqflags & URQ_REQUEST)
- panic("ohci_device_intr_transfer: a request\n");
+ panic("ohci_device_intr_transfer: a request");
#endif
len = xfer->length;
@@ -2918,7 +2918,7 @@ ohci_device_intr_close(usbd_pipe_handle pipe)
;
#ifdef DIAGNOSTIC
if (p == NULL)
- panic("ohci_device_intr_close: ED not found\n");
+ panic("ohci_device_intr_close: ED not found");
#endif
p->next = sed->next;
p->ed.ed_nexted = sed->ed.ed_nexted;
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 8606759f3f4..525c8be710c 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.26 2002/07/09 18:19:58 nate Exp $ */
+/* $OpenBSD: uhci.c,v 1.27 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: uhci.c,v 1.142 2001/10/25 02:08:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -1507,7 +1507,7 @@ uhci_waitintr(uhci_softc_t *sc, usbd_xfer_handle xfer)
;
#ifdef DIAGNOSTIC
if (ii == NULL)
- panic("uhci_waitintr: lost intr_info\n");
+ panic("uhci_waitintr: lost intr_info");
#endif
uhci_idone(ii);
}
@@ -1790,7 +1790,7 @@ uhci_device_bulk_start(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (xfer->rqflags & URQ_REQUEST)
- panic("uhci_device_bulk_transfer: a request\n");
+ panic("uhci_device_bulk_transfer: a request");
#endif
len = xfer->length;
@@ -1946,7 +1946,7 @@ uhci_device_ctrl_start(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (!(xfer->rqflags & URQ_REQUEST))
- panic("uhci_device_ctrl_transfer: not a request\n");
+ panic("uhci_device_ctrl_transfer: not a request");
#endif
err = uhci_device_request(xfer);
@@ -1995,7 +1995,7 @@ uhci_device_intr_start(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (xfer->rqflags & URQ_REQUEST)
- panic("uhci_device_intr_transfer: a request\n");
+ panic("uhci_device_intr_transfer: a request");
#endif
err = uhci_alloc_std_chain(upipe, sc, xfer->length, 1, xfer->flags,
@@ -2623,7 +2623,7 @@ uhci_device_ctrl_done(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (!(xfer->rqflags & URQ_REQUEST))
- panic("uhci_ctrl_done: not a request\n");
+ panic("uhci_ctrl_done: not a request");
#endif
uhci_del_intr_info(ii); /* remove from active list */
@@ -2945,7 +2945,7 @@ uhci_root_ctrl_start(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
if (!(xfer->rqflags & URQ_REQUEST))
- panic("uhci_root_ctrl_transfer: not a request\n");
+ panic("uhci_root_ctrl_transfer: not a request");
#endif
req = &xfer->request;
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index ea574737d74..44c4e37b815 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ulpt.c,v 1.13 2002/07/25 04:07:33 nate Exp $ */
+/* $OpenBSD: ulpt.c,v 1.14 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: ulpt.c,v 1.50 2002/07/11 21:14:31 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
@@ -224,7 +224,7 @@ USB_ATTACH(ulpt)
#ifdef DIAGNOSTIC
if (ifcd < (usb_interface_descriptor_t *)cdesc ||
ifcd >= iend)
- panic("ulpt: iface desc out of range\n");
+ panic("ulpt: iface desc out of range");
#endif
/* Step through all the descriptors looking for bidir mode */
for (id = ifcd, altno = 0;
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index ad9d539ab9f..30f49585d2c 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass.c,v 1.18 2002/07/25 02:18:10 nate Exp $ */
+/* $OpenBSD: umass.c,v 1.19 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: umass.c,v 1.49 2001/01/21 18:56:38 augustss Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -1116,7 +1116,7 @@ USB_ATTACH(umass)
sc->state = umass_cbi_state;
#ifdef UMASS_DEBUG
} else {
- panic("%s:%d: Unknown proto 0x%02x\n",
+ panic("%s:%d: Unknown proto 0x%02x",
__FILE__, __LINE__, sc->proto);
#endif
}
@@ -1804,7 +1804,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
} else if (sc->transfer_actlen > sc->transfer_datalen) {
/* Buffer overrun! Don't let this go by unnoticed */
- panic("%s: transferred %d bytes instead of %d bytes\n",
+ panic("%s: transferred %d bytes instead of %d bytes",
USBDEVNAME(sc->sc_dev),
sc->transfer_actlen, sc->transfer_datalen);
}
@@ -1882,7 +1882,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/***** Default *****/
default:
- panic("%s: Unknown state %d\n",
+ panic("%s: Unknown state %d",
USBDEVNAME(sc->sc_dev), sc->transfer_state);
}
}
@@ -2290,7 +2290,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/***** Default *****/
default:
- panic("%s: Unknown state %d\n",
+ panic("%s: Unknown state %d",
USBDEVNAME(sc->sc_dev), sc->transfer_state);
}
}
@@ -2860,7 +2860,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
umass_cam_sense_cb, (void *) ccb);
} else {
#ifdef UMASS_DEBUG
- panic("transform(REQUEST_SENSE) failed\n");
+ panic("transform(REQUEST_SENSE) failed");
#else
csio->resid = sc->transfer_datalen;
ccb->ccb_h.status = CAM_REQ_CMP_ERR;
@@ -2874,7 +2874,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
xpt_done(ccb);
break;
default:
- panic("umass_cam_cb called for func_code %d\n",
+ panic("umass_cam_cb called for func_code %d",
ccb->ccb_h.func_code);
}
break;
@@ -2889,7 +2889,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
break;
default:
- panic("%s: Unknown status %d in umass_cam_cb\n",
+ panic("%s: Unknown status %d in umass_cam_cb",
USBDEVNAME(sc->sc_dev), status);
}
}
@@ -3376,7 +3376,7 @@ umass_scsipi_cb(struct umass_softc *sc, void *priv, int residue, int status)
break;
default:
- panic("%s: Unknown status %d in umass_scsipi_cb\n",
+ panic("%s: Unknown status %d in umass_scsipi_cb",
USBDEVNAME(sc->sc_dev), status);
}
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 9e2570cf152..bdeb3e2ba0e 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.c,v 1.20 2002/07/25 02:18:11 nate Exp $ */
+/* $OpenBSD: usbdi.c,v 1.21 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: usbdi.c,v 1.81 2001/04/17 00:05:33 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -294,7 +294,7 @@ usbd_transfer(usbd_xfer_handle xfer)
s = splusb();
if (!xfer->done) {
if (pipe->device->bus->use_polling)
- panic("usbd_transfer: not done\n");
+ panic("usbd_transfer: not done");
tsleep(xfer, PRIBIO, "usbsyn", 0);
}
splx(s);
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index fb442661d61..942d4a2ac35 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.48 2002/08/21 16:51:27 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.49 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */
/*
@@ -680,7 +680,7 @@ wsdisplay_common_attach(sc, console, scrdata, accessops, accesscookie)
sc->sc_muxdv = wsmux_create("dmux", sc->sc_dv.dv_unit);
if (!sc->sc_muxdv)
- panic("wsdisplay_common_attach: no memory\n");
+ panic("wsdisplay_common_attach: no memory");
sc->sc_muxdv->sc_displaydv = &sc->sc_dv;
#endif
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index 41a275e5c4d..8272ceacea1 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.7 2002/03/14 01:27:03 millert Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.8 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
/*
@@ -969,7 +969,7 @@ wsemul_vt100_output(cookie, data, count, kernel)
}
#ifdef DIAGNOSTIC
if (edp->state > sizeof(vt100_output) / sizeof(vt100_output[0]))
- panic("wsemul_vt100: invalid state %d\n", edp->state);
+ panic("wsemul_vt100: invalid state %d", edp->state);
#endif
edp->state = vt100_output[edp->state - 1](edp, *data);
}
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 93218db9b4f..5d745573dae 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmux.c,v 1.9 2002/04/30 23:01:55 mickey Exp $ */
+/* $OpenBSD: wsmux.c,v 1.10 2002/10/12 01:09:44 krw Exp $ */
/* $NetBSD: wsmux.c,v 1.9 2000/05/28 10:33:14 takemura Exp $ */
/*
@@ -116,7 +116,7 @@ wsmux_setmax(n)
wsmuxdevs_tmp = malloc(nwsmux * sizeof(*wsmuxdevs_tmp),
M_DEVBUF, M_NOWAIT);
if (wsmuxdevs_tmp == 0)
- panic("wsmux_setmax: no mem\n");
+ panic("wsmux_setmax: no mem");
for (i = 0; i < nwsmux; i++)
wsmuxdevs_tmp[i] = wsmuxdevs[i];
free(wsmuxdevs, M_DEVBUF);
@@ -125,7 +125,7 @@ wsmux_setmax(n)
wsmuxdevs = malloc((n + 1) * sizeof(*wsmuxdevs),
M_DEVBUF, M_NOWAIT);
if (wsmuxdevs == NULL)
- panic("wsmux_setmax: no memory\n");
+ panic("wsmux_setmax: no memory");
memset(wsmuxdevs, 0, (n + 1) * sizeof(*wsmuxdevs));
if (wsmuxdevs_tmp != NULL) {
for (i = 0; i < nwsmux; i++)
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 104bf09ef10..11f7871698d 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfont.c,v 1.6 2002/08/17 20:55:30 millert Exp $ */
+/* $OpenBSD: wsfont.c,v 1.7 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */
/*-
@@ -524,7 +524,7 @@ wsfont_unlock(cookie)
if ((ent = wsfont_find0(cookie)) != NULL) {
if (ent->lockcount == 0)
- panic("wsfont_unlock: font not locked\n");
+ panic("wsfont_unlock: font not locked");
lc = --ent->lockcount;
} else
lc = -1;
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index ca61d080e33..573adbb4487 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.32 2002/07/23 15:31:36 art Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.33 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -558,7 +558,7 @@ pool_destroy(struct pool *pp)
#ifdef DIAGNOSTIC
if (pp->pr_nout != 0) {
pr_printlog(pp, NULL, printf);
- panic("pool_destroy: pool busy: still out: %u\n",
+ panic("pool_destroy: pool busy: still out: %u",
pp->pr_nout);
}
#endif
@@ -708,7 +708,7 @@ pool_get(struct pool *pp, int flags)
simple_unlock(&pp->pr_slock);
printf("pool_get: %s: curpage NULL, nitems %u\n",
pp->pr_wchan, pp->pr_nitems);
- panic("pool_get: nitems inconsistent\n");
+ panic("pool_get: nitems inconsistent");
}
#endif
@@ -778,7 +778,7 @@ pool_get(struct pool *pp, int flags)
simple_unlock(&pp->pr_slock);
printf("pool_get: %s: items on itemlist, nitems %u\n",
pp->pr_wchan, pp->pr_nitems);
- panic("pool_get: nitems inconsistent\n");
+ panic("pool_get: nitems inconsistent");
}
#endif
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index cd18ff1db73..0cd2a3a177b 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket2.c,v 1.32 2002/10/10 22:27:30 art Exp $ */
+/* $OpenBSD: uipc_socket2.c,v 1.33 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */
/*
@@ -450,7 +450,7 @@ sblastrecordchk(struct sockbuf *sb, const char *where)
printf("packet chain:\n");
for (m = sb->sb_mb; m != NULL; m = m->m_nextpkt)
printf("\t%p\n", m);
- panic("sblastrecordchk from %s\n", where);
+ panic("sblastrecordchk from %s", where);
}
}
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index c9c41062f3b..ff7374c2a57 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.64 2002/09/11 03:15:36 itojun Exp $ */
+/* $OpenBSD: icmp6.c,v 1.65 2002/10/12 01:09:45 krw Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -2670,7 +2670,7 @@ icmp6_redirect_output(m0, rt)
* and truncates if not.
*/
if (m0->m_next || m0->m_pkthdr.len != m0->m_len)
- panic("assumption failed in %s:%d\n", __FILE__, __LINE__);
+ panic("assumption failed in %s:%d", __FILE__, __LINE__);
if (len - sizeof(*nd_opt_rh) < m0->m_pkthdr.len) {
/* not enough room, truncate */
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 627a5f762be..dd0ca7832b6 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_cksum.c,v 1.9 2001/06/09 06:43:37 angelos Exp $ */
+/* $OpenBSD: in6_cksum.c,v 1.10 2002/10/12 01:09:45 krw Exp $ */
/* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */
/*
@@ -121,7 +121,7 @@ in6_cksum(m, nxt, off, len)
/* sanity check */
if (m->m_pkthdr.len < off + len) {
- panic("in6_cksum: mbuf len (%d) < off+len (%d+%d)\n",
+ panic("in6_cksum: mbuf len (%d) < off+len (%d+%d)",
m->m_pkthdr.len, off, len);
}
@@ -306,7 +306,7 @@ in6_cksum(m, nxt, off, len)
s_util.c[0] = *(char *)w;
}
if (len)
- panic("in6_cksum: out of data\n");
+ panic("in6_cksum: out of data");
if (mlen == -1) {
/* The last mbuf has odd # of bytes. Follow the
standard (the odd byte may be shifted left by 8 bits
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 165cb9a1342..97d269ec6c0 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6.c,v 1.59 2002/10/09 20:25:32 itojun Exp $ */
+/* $OpenBSD: nd6.c,v 1.60 2002/10/12 01:09:45 krw Exp $ */
/* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */
/*
@@ -243,9 +243,9 @@ nd6_option(ndopts)
int olen;
if (!ndopts)
- panic("ndopts == NULL in nd6_option\n");
+ panic("ndopts == NULL in nd6_option");
if (!ndopts->nd_opts_last)
- panic("uninitialized ndopts in nd6_option\n");
+ panic("uninitialized ndopts in nd6_option");
if (!ndopts->nd_opts_search)
return NULL;
if (ndopts->nd_opts_done)
@@ -295,9 +295,9 @@ nd6_options(ndopts)
int i = 0;
if (!ndopts)
- panic("ndopts == NULL in nd6_options\n");
+ panic("ndopts == NULL in nd6_options");
if (!ndopts->nd_opts_last)
- panic("uninitialized ndopts in nd6_options\n");
+ panic("uninitialized ndopts in nd6_options");
if (!ndopts->nd_opts_search)
return 0;
@@ -410,12 +410,12 @@ nd6_timer(ignored_arg)
/* sanity check */
if (!rt)
- panic("rt=0 in nd6_timer(ln=%p)\n", ln);
+ panic("rt=0 in nd6_timer(ln=%p)", ln);
if (rt->rt_llinfo && (struct llinfo_nd6 *)rt->rt_llinfo != ln)
- panic("rt_llinfo(%p) is not equal to ln(%p)\n",
+ panic("rt_llinfo(%p) is not equal to ln(%p)",
rt->rt_llinfo, ln);
if (!dst)
- panic("dst=0 in nd6_timer(ln=%p)\n", ln);
+ panic("dst=0 in nd6_timer(ln=%p)", ln);
switch (ln->ln_state) {
case ND6_LLINFO_INCOMPLETE:
diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c
index e8e52a3e267..b5c21c3957e 100644
--- a/sys/ufs/ext2fs/ext2fs_lookup.c
+++ b/sys/ufs/ext2fs/ext2fs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_lookup.c,v 1.13 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ext2fs_lookup.c,v 1.14 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */
/*
@@ -106,7 +106,7 @@ ext2fs_dirconv2ffs( e2dir, ffsdir)
* MAXNAMLEN != E2FS_MAXNAMLEN we should handle this more gracefully !
*/
if (e2dir->e2d_namlen > MAXNAMLEN)
- panic("ext2fs: e2dir->e2d_namlen\n");
+ panic("ext2fs: e2dir->e2d_namlen");
#endif
strncpy(ffsdir->d_name, e2dir->e2d_name, ffsdir->d_namlen);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 2ffda7b690d..65e05e72711 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep.c,v 1.41 2002/07/16 22:54:42 millert Exp $ */
+/* $OpenBSD: ffs_softdep.c,v 1.42 2002/10/12 01:09:45 krw Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
*
@@ -1454,7 +1454,7 @@ softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
/*
* XXXUBC - Yes, I know how to fix this, but not right now.
*/
- panic("softdep_setup_allocdirect: Bonk art in the head\n");
+ panic("softdep_setup_allocdirect: Bonk art in the head");
}
WORKLIST_INSERT(&bp->b_dep, &adp->ad_list);
if (lbn >= NDADDR) {
@@ -1689,7 +1689,7 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
/*
* XXXUBC - Yes, I know how to fix this, but not right now.
*/
- panic("softdep_setup_allocindir_page: Bonk art in the head\n");
+ panic("softdep_setup_allocindir_page: Bonk art in the head");
}
WORKLIST_INSERT(&nbp->b_dep, &aip->ai_list);
FREE_LOCK(&lk);
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index c0ed9ffd93b..fc64d5abc4d 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_page.c,v 1.45 2002/09/12 12:56:16 art Exp $ */
+/* $OpenBSD: uvm_page.c,v 1.46 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
/*
@@ -613,7 +613,7 @@ uvm_page_physload(start, end, avail_start, avail_end, free_list)
panic("uvm_page_physload: page size not set!");
if (free_list >= VM_NFREELIST || free_list < VM_FREELIST_DEFAULT)
- panic("uvm_page_physload: bad free list %d\n", free_list);
+ panic("uvm_page_physload: bad free list %d", free_list);
if (start >= end)
panic("uvm_page_physload: start >= end");
@@ -1106,7 +1106,7 @@ uvm_pagefree(pg)
#ifdef DEBUG
if (pg->uobject == (void *)0xdeadbeef &&
pg->uanon == (void *)0xdeadbeef) {
- panic("uvm_pagefree: freeing free page %p\n", pg);
+ panic("uvm_pagefree: freeing free page %p", pg);
}
#endif
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 406ff61b4a8..a85cd7ca0dc 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.54 2002/07/02 19:38:55 nate Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.55 2002/10/12 01:09:45 krw Exp $ */
/* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */
/*
@@ -1152,7 +1152,7 @@ swap_off(p, sdp)
uvmexp.swpages -= sdp->swd_npages;
if (swaplist_find(sdp->swd_vp, 1) == NULL)
- panic("swap_off: swapdev not in list\n");
+ panic("swap_off: swapdev not in list");
swaplist_trim();
/*