diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
commit | b3067fd524234e263e58b215d0fb24d414bf1c34 (patch) | |
tree | 5c1576265dded5700ab387af81051fabd39f3396 /sys/arch/sparc | |
parent | 9ee95b4b405b050512cf782b508d774f4601a6b5 (diff) |
panic prints a newline for you, don't do it in the panic string
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r-- | sys/arch/sparc/dev/if_ie.c | 6 | ||||
-rw-r--r-- | sys/arch/sparc/dev/isp_sbus.c | 10 | ||||
-rw-r--r-- | sys/arch/sparc/dev/si.c | 6 | ||||
-rw-r--r-- | sys/arch/sparc/dev/xy.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/iommu.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/pmap.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/stand/common/promdev.c | 6 |
8 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index d57746dbadc..64fb8b566e0 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.7 1997/08/08 08:25:09 downsj Exp $ */ +/* $OpenBSD: if_ie.c,v 1.8 1999/01/11 05:11:55 millert Exp $ */ /* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */ /*- @@ -1529,7 +1529,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; @@ -1715,7 +1715,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/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c index 3fe4bfcf742..70c30a1958f 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.3 1998/11/11 00:50:31 jason Exp $ */ +/* $OpenBSD: isp_sbus.c,v 1.4 1999/01/11 05:11:56 millert Exp $ */ /* $NetBSD: isp_sbus.c,v 1.8 1997/08/27 11:24:19 bouyer Exp $ */ /* @@ -281,7 +281,7 @@ isp_sbus_dmasetup(isp, xs, rq, iptrp, optr) if (rq->req_handle > RQUEST_QUEUE_LEN(isp) || rq->req_handle < 1) { - panic("%s: bad handle (%d) in isp_sbus_dmasetup\n", + panic("%s: bad handle (%d) in isp_sbus_dmasetup", isp->isp_name, rq->req_handle); /* NOTREACHED */ } @@ -296,7 +296,7 @@ isp_sbus_dmasetup(isp, xs, rq, iptrp, optr) } if (sbc->sbus_kdma_allocs[rq->req_handle - 1] != (vm_offset_t) 0) { - panic("%s: kdma handle already allocated\n", isp->isp_name); + panic("%s: kdma handle already allocated", isp->isp_name); /* NOTREACHED */ } sbc->sbus_kdma_allocs[rq->req_handle - 1] = kdvma; @@ -325,12 +325,12 @@ isp_sbus_dmateardown(isp, xs, handle) } if (handle >= RQUEST_QUEUE_LEN(isp)) { - panic("%s: bad handle (%d) in isp_sbus_dmateardown\n", + panic("%s: bad handle (%d) in isp_sbus_dmateardown", isp->isp_name, handle); /* NOTREACHED */ } if (sbc->sbus_kdma_allocs[handle] == (vm_offset_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[handle]; diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 26238e8442d..c057556f08c 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.11 1997/09/17 06:47:11 downsj Exp $ */ +/* $OpenBSD: si.c,v 1.12 1999/01/11 05:11:56 millert Exp $ */ /* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */ /*- @@ -431,7 +431,7 @@ si_attach(parent, self, args) i = SCI_OPENINGS * sizeof(struct si_dma_handle); sc->sc_dma = (struct si_dma_handle *)malloc(i, M_DEVBUF, M_NOWAIT); if (sc->sc_dma == NULL) - panic("si: dma handle malloc failed\n"); + panic("si: dma handle malloc failed"); for (i = 0; i < SCI_OPENINGS; i++) sc->sc_dma[i].dh_flags = 0; @@ -655,7 +655,7 @@ si_dma_alloc(ncr_sc) /* Make sure our caller checked sc_min_dma_len. */ if (xlen < MIN_DMA_LEN) - panic("si_dma_alloc: xlen=0x%x\n", xlen); + panic("si_dma_alloc: xlen=0x%x", xlen); /* Find free DMA handle. Guaranteed to find one since we have as many DMA handles as the driver has processes. */ diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 0f548225f38..9e17ac34c99 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.11 1998/10/03 21:18:58 millert Exp $ */ +/* $OpenBSD: xy.c,v 1.12 1999/01/11 05:11:57 millert Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -1390,7 +1390,7 @@ xyc_submit_iorq(xycsc, iorq, type) if (iopb == NULL) { /* nothing doing? */ if (type == XY_SUB_NORM || type == XY_SUB_NOQ) return(XY_ERR_AOK); - panic("xyc_submit_iorq: xyc_chain failed!\n"); + panic("xyc_submit_iorq: xyc_chain failed!"); } iopbaddr = (u_long) iopb - DVMA_BASE; diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index b36233e2ad5..208c7bf6bf7 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.28 1998/04/17 18:18:02 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.29 1999/01/11 05:11:58 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -850,7 +850,7 @@ configure() node = findroot(); cp = getpropstring(node, "device_type"); if (strcmp(cp, "cpu") != 0) - panic("PROM root device type = %s (need CPU)\n", cp); + panic("PROM root device type = %s (need CPU)", cp); } #endif #if defined(SUN4M) diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 91d125afae4..a817c531d58 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.3 1997/08/08 08:27:20 downsj Exp $ */ +/* $OpenBSD: iommu.c,v 1.4 1999/01/11 05:11:58 millert Exp $ */ /* $NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */ /* @@ -225,7 +225,7 @@ iommu_attach(parent, self, aux) /* calculate log2(sc->sc_range/16MB) */ i = ffs(sc->sc_range/(1 << 24)) - 1; if ((1 << i) != (sc->sc_range/(1 << 24))) - panic("bad iommu range: %d\n",i); + panic("bad iommu range: %d",i); s = splhigh(); IOMMU_FLUSHALL(sc); diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index f3cd9f94241..8ccd5f9dea9 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.22 1998/05/29 16:21:35 jason Exp $ */ +/* $OpenBSD: pmap.c,v 1.23 1999/01/11 05:11:59 millert Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -821,7 +821,7 @@ pmap_next_page(paddr) #ifdef DIAGNOSTIC /* Any available memory remaining? */ if (avail_next >= avail_end) { - panic("pmap_next_page: too much memory?!\n"); + panic("pmap_next_page: too much memory?!"); } #endif diff --git a/sys/arch/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c index 25057863046..b9a56663ba4 100644 --- a/sys/arch/sparc/stand/common/promdev.c +++ b/sys/arch/sparc/stand/common/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.1 1997/09/17 10:46:19 downsj Exp $ */ +/* $OpenBSD: promdev.c,v 1.2 1999/01/11 05:12:00 millert Exp $ */ /* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */ /* @@ -756,12 +756,12 @@ prom_mapin(physaddr, length, maptype) int i, pa, pte, va; if (length > (4*NBPG)) - panic("prom_mapin: length=%d\n", length); + panic("prom_mapin: length=%d", length); for (i = 0; i < prom_mapinfo_cnt; i++) if (prom_mapinfo[i].maptype == maptype) goto found; - panic("prom_mapin: invalid maptype %d\n", maptype); + panic("prom_mapin: invalid maptype %d", maptype); found: pte = prom_mapinfo[i].pgtype; |