summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c14
-rw-r--r--sys/arch/sparc64/sparc64/pmap.c20
-rw-r--r--sys/dev/ieee1394/fwohci.c10
-rw-r--r--sys/dev/raidframe/rf_openbsdkintf.c16
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c6
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c4
6 files changed, 35 insertions, 35 deletions
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index b5e9e1ed9c7..bef12775503 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.95 2002/07/20 19:24:56 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.96 2002/10/12 02:03:45 krw Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -1678,7 +1678,7 @@ m188_ext_int(u_int v, struct m88100_saved_state *eframe)
level, intbit, 1 << intbit, IST_STRING);
}
if (vec > 0xFF) {
- panic("interrupt vector 0x%x greater than 255!\n"
+ panic("interrupt vector 0x%x greater than 255!"
"level = %d iack = 0x%x",
vec, level, ivec[level]);
}
@@ -1767,7 +1767,7 @@ m187_ext_int(u_int v, struct m88100_saved_state *eframe)
*/
if ((mask == level) && level) {
- panic("mask == level, %d\n", level);
+ panic("mask == level, %d", level);
}
/*
@@ -1776,7 +1776,7 @@ m187_ext_int(u_int v, struct m88100_saved_state *eframe)
*/
if (level == 0) {
- panic("Bogons... level %x and mask %x\n", level, mask);
+ panic("Bogons... level %x and mask %x", level, mask);
}
/* and block interrupts at level or lower */
@@ -1793,7 +1793,7 @@ m187_ext_int(u_int v, struct m88100_saved_state *eframe)
/* generate IACK and get the vector */
flush_pipeline();
if (guarded_access(ivec[level], 1, &vec) == EFAULT) {
- panic("Unable to get vector for this interrupt (level %x)\n", level);
+ panic("Unable to get vector for this interrupt (level %x)", level);
}
flush_pipeline();
flush_pipeline();
@@ -1890,7 +1890,7 @@ m197_ext_int(u_int v, struct m88100_saved_state *eframe)
*/
if (level == 0) {
- panic("Bogons... level %x and mask %x\n", level, mask);
+ panic("Bogons... level %x and mask %x", level, mask);
}
/* and block interrupts at level or lower */
@@ -1908,7 +1908,7 @@ m197_ext_int(u_int v, struct m88100_saved_state *eframe)
/* generate IACK and get the vector */
flush_pipeline();
if (guarded_access(ivec[level], 1, &vec) == EFAULT) {
- panic("Unable to get vector for this interrupt (level %x)\n", level);
+ panic("Unable to get vector for this interrupt (level %x)", level);
}
flush_pipeline();
flush_pipeline();
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index 31178e99846..105cf046ed2 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.20 2002/10/07 18:35:57 mickey Exp $ */
+/* $OpenBSD: pmap.c,v 1.21 2002/10/12 02:03:45 krw Exp $ */
/* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
/*
@@ -83,16 +83,16 @@ pseg_check(struct pmap *pm, vaddr_t addr, int64_t tte, paddr_t spare)
if (!spare) return pseg_set(pm, addr, tte, spare);
s = splvm();
- if ((paddr_t)pm->pm_segs == spare) panic("pseg_check: pm_segs == %llx\n", spare);
+ if ((paddr_t)pm->pm_segs == spare) panic("pseg_check: pm_segs == %llx", spare);
for (i=0; i<STSZ; i++) {
if ((pdir = (paddr_t *)(u_long)ldxa((vaddr_t)&pm->pm_segs[i], ASI_PHYS_CACHED))) {
if ((paddr_t)pdir == spare)
- panic("pseg_check: pdir %d == %llx\n", i,
+ panic("pseg_check: pdir %d == %llx", i,
spare);
for (k=0; k<PDSZ; k++) {
if ((ptbl = (paddr_t *)(u_long)ldxa((vaddr_t)&pdir[k], ASI_PHYS_CACHED))) {
if ((paddr_t)ptbl == spare)
- panic("pseg_check: ptbl %d:%d == %llx\n", i, k,
+ panic("pseg_check: ptbl %d:%d == %llx", i, k,
spare);
}
}
@@ -181,10 +181,10 @@ void pmap_copy_phys(paddr_t src, paddr_t dst);
#ifdef DEBUG
#ifdef __STDC__
#define ASSERT(x) \
- if (!(x)) panic("%s at line %d: assertion failed\n", #x, __LINE__);
+ if (!(x)) panic("%s at line %d: assertion failed", #x, __LINE__);
#else
#define ASSERT(x) \
- if (!(x)) panic("%s at line %d: assertion failed\n", "x", __LINE__);
+ if (!(x)) panic("%s at line %d: assertion failed", "x", __LINE__);
#endif
#else
#define ASSERT(x)
@@ -909,7 +909,7 @@ remap_data:
if (prom_map[i].vstart == ktext)
break;
if (i == prom_map_size)
- panic("No kernel text segment!\r\n");
+ panic("No kernel text segment!");
ktsize = prom_map[i].vsize;
ektext = ktext + ktsize;
@@ -1088,7 +1088,7 @@ remap_data:
prom_printf("TSB alloc fixup failed\r\n");
prom_printf("frobbed i, firstaddr before TSB=%x, %lx\r\n",
(int)i, (u_long)firstaddr);
- panic("TSB alloc\n");
+ panic("TSB alloc");
OF_exit();
}
#endif
@@ -2091,7 +2091,7 @@ pmap_kremove(va, size)
#ifdef DIAGNOSTIC
if (pm == pmap_kernel() &&
(va >= ktext && va < roundup(ekdata, 4*MEG)))
- panic("pmap_kremove: va=%08x in locked TLB\r\n",
+ panic("pmap_kremove: va=%08x in locked TLB",
(u_int)va);
#endif
/* Shouldn't need to do this if the entry's not valid. */
@@ -2335,7 +2335,7 @@ pmap_remove(pm, va, endva)
#ifdef DIAGNOSTIC
if (pm == pmap_kernel() && va >= ktext &&
va < roundup(ekdata, 4*MEG))
- panic("pmap_remove: va=%08x in locked TLB\r\n", (u_int)va);
+ panic("pmap_remove: va=%08x in locked TLB", (u_int)va);
#endif
/* We don't really need to do this if the valid bit is not set... */
if ((data = pseg_get(pm, va))) {
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index 85ef5f66a98..30ddb2787ca 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fwohci.c,v 1.3 2002/07/07 13:41:27 tdeval Exp $ */
+/* $OpenBSD: fwohci.c,v 1.4 2002/10/12 02:03:46 krw Exp $ */
/* $NetBSD: fwohci.c,v 1.54 2002/03/29 05:06:42 jmc Exp $ */
/*-
@@ -3307,9 +3307,9 @@ fwohci_write(struct ieee1394_abuf *ab)
}
if (ab->ab_data && ab->ab_uio)
- panic("Can't call with uio and data set\n");
+ panic("Can't call with uio and data set");
if ((ab->ab_data == NULL) && (ab->ab_uio == NULL))
- panic("One of either ab_data or ab_uio must be set\n");
+ panic("One of either ab_data or ab_uio must be set");
memset(&pkt, 0, sizeof(pkt));
@@ -3774,12 +3774,12 @@ fwohci_parse_input(struct fwohci_softc *sc, void *arg, struct fwohci_pkt *pkt)
}
if (ab->ab_retlen != count)
panic("Packet claims %d length "
- "but only %d bytes returned\n",
+ "but only %d bytes returned",
ab->ab_retlen, count);
}
break;
default:
- panic("Got a callback for a tcode that wasn't requested: %d\n",
+ panic("Got a callback for a tcode that wasn't requested: %d",
ab->ab_tcode);
break;
}
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 62b966abb35..18964abf085 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.19 2002/08/09 15:10:20 tdeval Exp $ */
+/* $OpenBSD: rf_openbsdkintf.c,v 1.20 2002/10/12 02:03:46 krw Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -391,7 +391,7 @@ raidattach(num)
/* Make some space for requested number of units... */
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);
@@ -407,7 +407,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..
@@ -437,7 +437,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++) {
@@ -1897,7 +1897,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];
@@ -2110,7 +2110,7 @@ rf_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 rf_InitBP!!\n");
+ panic("bp->b_bcount is zero in rf_InitBP!!");
}
bp->b_proc = b_proc;
bp->b_iodone = cbFunc;
@@ -3008,7 +3008,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;
@@ -3033,7 +3033,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/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 34f0e9dfdb5..68ded75d74b 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vfsops.c,v 1.18 2002/03/14 01:27:08 millert Exp $ */
+/* $OpenBSD: kernfs_vfsops.c,v 1.19 2002/10/12 02:03:46 krw Exp $ */
/* $NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $ */
/*
@@ -178,12 +178,12 @@ kernfs_root(mp, vpp)
kt = kernfs_findtarget(".", 1);
/* this should never happen */
if (kt == NULL)
- panic("kernfs_root: findtarget returned NULL\n");
+ panic("kernfs_root: findtarget returned NULL");
error = kernfs_allocvp(kt, mp, vpp);
/* this should never happen */
if (error)
- panic("kernfs_root: couldn't find root\n");
+ panic("kernfs_root: couldn't find root");
return(0);
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 6531b343ff8..269c0842653 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vnops.c,v 1.27 2002/03/14 20:31:31 mickey Exp $ */
+/* $OpenBSD: kernfs_vnops.c,v 1.28 2002/10/12 02:03:46 krw Exp $ */
/* $NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $ */
/*
@@ -232,7 +232,7 @@ kernfs_allocvp(kt, mp, vpp)
#ifdef KERNFS_DIAGNOSTIC
/* this should never happen */
if (kt == NULL)
- panic("kernfs_allocvp passed NULL kt, mp %p, vpp %p!\n", mp, vpp);
+ panic("kernfs_allocvp passed NULL kt, mp %p, vpp %p!", mp, vpp);
printf("kernfs_allocvp: looking for %s\n", kt->kt_name);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 04:43:14 +0000