summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2005-07-18 02:43:28 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2005-07-18 02:43:28 +0000
commit1da0eb00b64cf96fafeda15abecc0ea97c01cfc7 (patch)
tree07ce3426901e09feb49ab2c3174d982a7fc02646
parentd682261e1331abf1c2f9fa2d157d5b8f51360fdd (diff)
remove trailing newline in panic(9); ok millert@ and deraadt@
-rw-r--r--sys/arch/amd64/amd64/cpu.c4
-rw-r--r--sys/arch/amd64/amd64/intr.c4
-rw-r--r--sys/arch/amd64/amd64/mpbios.c4
-rw-r--r--sys/arch/amd64/include/mutex.h6
-rw-r--r--sys/arch/arm/arm/pmap.c4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_space.c6
-rw-r--r--sys/arch/hppa/hppa/trap.c4
-rw-r--r--sys/arch/hppa64/hppa64/trap.c4
-rw-r--r--sys/arch/i386/i386/cpu.c6
-rw-r--r--sys/arch/i386/i386/mpbios.c4
-rw-r--r--sys/arch/i386/include/mutex.h6
-rw-r--r--sys/arch/luna88k/luna88k/isr.c4
-rw-r--r--sys/arch/mac68k/dev/esp.c4
-rw-r--r--sys/arch/mips64/mips64/interrupt.c4
-rw-r--r--sys/arch/mvme88k/dev/bussw.c4
-rw-r--r--sys/arch/mvme88k/dev/pcctwo.c4
-rw-r--r--sys/arch/mvme88k/dev/syscon.c4
-rw-r--r--sys/arch/sgi/localbus/macebus.c4
-rw-r--r--sys/arch/solbourne/solbourne/trap.c4
-rw-r--r--sys/dev/ic/aic79xx.c22
-rw-r--r--sys/dev/ic/aic7xxx.c6
-rw-r--r--sys/dev/ic/aic7xxx_inline.h4
-rw-r--r--sys/dev/ic/ath.c6
-rw-r--r--sys/dev/ic/atw.c6
-rw-r--r--sys/dev/ic/rtw.c8
-rw-r--r--sys/dev/pci/ami_pci.c4
-rw-r--r--sys/dev/usb/usb_subr.c4
-rw-r--r--sys/kern/uipc_socket2.c4
-rw-r--r--sys/sys/mutex.h6
29 files changed, 77 insertions, 77 deletions
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 0913c81fc38..cf12178674d 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.8 2005/05/24 09:30:32 deraadt Exp $ */
+/* $OpenBSD: cpu.c,v 1.9 2005/07/18 02:43:24 fgsch Exp $ */
/* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@@ -361,7 +361,7 @@ cpu_attach(parent, self, aux)
break;
default:
- panic("unknown processor type??\n");
+ panic("unknown processor type??");
}
cpu_vm_init(ci);
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
index 703cc3caf47..d8b96d185f7 100644
--- a/sys/arch/amd64/amd64/intr.c
+++ b/sys/arch/amd64/amd64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.8 2005/05/28 05:15:18 niklas Exp $ */
+/* $OpenBSD: intr.c,v 1.9 2005/07/18 02:43:24 fgsch Exp $ */
/* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */
/*
@@ -415,7 +415,7 @@ intr_establish(int legacy_irq, struct pic *pic, int pin, int type, int level,
break;
default:
simple_unlock(&ci->ci_slock);
- panic("intr_establish: bad intr type %d for pic %s pin %d\n",
+ panic("intr_establish: bad intr type %d for pic %s pin %d",
source->is_type, pic->pic_dev.dv_xname, pin);
}
diff --git a/sys/arch/amd64/amd64/mpbios.c b/sys/arch/amd64/amd64/mpbios.c
index e9b8cd67f86..dde327e3d0b 100644
--- a/sys/arch/amd64/amd64/mpbios.c
+++ b/sys/arch/amd64/amd64/mpbios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpbios.c,v 1.1 2004/06/25 11:03:27 art Exp $ */
+/* $OpenBSD: mpbios.c,v 1.2 2005/07/18 02:43:24 fgsch Exp $ */
/* $NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $ */
/*-
@@ -918,7 +918,7 @@ mpbios_bus(ent, self)
* from underneath us
*/
if (bus_id >= mp_nbus) {
- panic("mpbios: bus number %d out of range?? (type %6.6s)\n",
+ panic("mpbios: bus number %d out of range?? (type %6.6s)",
bus_id, entry->bus_type);
}
#endif
diff --git a/sys/arch/amd64/include/mutex.h b/sys/arch/amd64/include/mutex.h
index 94ceb969ae2..1c712e87bce 100644
--- a/sys/arch/amd64/include/mutex.h
+++ b/sys/arch/amd64/include/mutex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.h,v 1.2 2005/04/08 07:07:06 jolan Exp $ */
+/* $OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:24 fgsch Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -37,12 +37,12 @@ struct mutex {
#define MUTEX_ASSERT_LOCKED(mtx) do { \
if ((mtx)->mtx_owner != curcpu()) \
- panic("mutex %p not held in %s\n", (mtx), __func__); \
+ panic("mutex %p not held in %s", (mtx), __func__); \
} while (0)
#define MUTEX_ASSERT_UNLOCKED(mtx) do { \
if ((mtx)->mtx_owner == curcpu()) \
- panic("mutex %p held in %s\n", (mtx), __func__); \
+ panic("mutex %p held in %s", (mtx), __func__); \
} while (0)
#define MUTEX_OLDIPL(mtx) (mtx)->mtx_oldipl
diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index a102bc344c9..0721d7c766e 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.5 2005/02/01 15:41:24 drahn Exp $ */
+/* $OpenBSD: pmap.c,v 1.6 2005/07/18 02:43:24 fgsch Exp $ */
/* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */
/*
@@ -4048,7 +4048,7 @@ pmap_set_pt_cache_mode(pd_entry_t *kl1, vaddr_t va)
pa = (paddr_t)(pde & L1_C_ADDR_MASK);
ptep = (pt_entry_t *)kernel_pt_lookup(pa);
if (ptep == NULL)
- panic("pmap_bootstrap: No L2 for L2 @ va %p\n", ptep);
+ panic("pmap_bootstrap: No L2 for L2 @ va %p", ptep);
ptep = &ptep[l2pte_index(va)];
pte = *ptep;
diff --git a/sys/arch/arm/xscale/pxa2x0_space.c b/sys/arch/arm/xscale/pxa2x0_space.c
index db64d578459..e49c338ba74 100644
--- a/sys/arch/arm/xscale/pxa2x0_space.c
+++ b/sys/arch/arm/xscale/pxa2x0_space.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_space.c,v 1.2 2005/01/02 19:52:36 drahn Exp $ */
+/* $OpenBSD: pxa2x0_space.c,v 1.3 2005/07/18 02:43:24 fgsch Exp $ */
/* $NetBSD: pxa2x0_space.c,v 1.5 2004/06/07 19:45:22 nathanw Exp $ */
/*
@@ -256,13 +256,13 @@ pxa2x0_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
bus_addr_t *bpap, bus_space_handle_t *bshp)
{
- panic("pxa2x0_io_bs_alloc(): not implemented\n");
+ panic("pxa2x0_io_bs_alloc(): not implemented");
}
void
pxa2x0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
- panic("pxa2x0_io_bs_free(): not implemented\n");
+ panic("pxa2x0_io_bs_free(): not implemented");
}
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index 63b6043e42f..2273df5d94e 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.86 2005/05/26 04:34:52 kettenis Exp $ */
+/* $OpenBSD: trap.c,v 1.87 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -423,7 +423,7 @@ trap(type, frame)
sv.sival_int = va;
trapsignal(p, SIGILL, type & ~T_USER, ILL_ILLTRP, sv);
} else
- panic("trap: %s @ 0x%x:0x%x for 0x%x:0x%x irr 0x%08x\n",
+ panic("trap: %s @ 0x%x:0x%x for 0x%x:0x%x irr 0x%08x",
tts, frame->tf_iisq_head, frame->tf_iioq_head,
space, va, opcode);
break;
diff --git a/sys/arch/hppa64/hppa64/trap.c b/sys/arch/hppa64/hppa64/trap.c
index e0046725ad1..0518adc001c 100644
--- a/sys/arch/hppa64/hppa64/trap.c
+++ b/sys/arch/hppa64/hppa64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.1 2005/04/01 10:40:47 mickey Exp $ */
+/* $OpenBSD: trap.c,v 1.2 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -388,7 +388,7 @@ trap(type, frame)
sv.sival_int = va;
trapsignal(p, SIGILL, type & ~T_USER, ILL_ILLTRP, sv);
} else
- panic("trap: %s @ 0x%x:0x%x for 0x%x:0x%x irr 0x%08x\n",
+ panic("trap: %s @ 0x%x:0x%x for 0x%x:0x%x irr 0x%08x",
tts, frame->tf_iisq[0], frame->tf_iioq[0],
space, va, opcode);
break;
diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 8f1db080dd7..304f54eea91 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.14 2005/05/27 10:41:11 kjell Exp $ */
+/* $OpenBSD: cpu.c,v 1.15 2005/07/18 02:43:25 fgsch Exp $ */
/* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
/*-
@@ -200,7 +200,7 @@ cpu_attach(parent, self, aux)
if (caa->cpu_role != CPU_ROLE_AP) {
if (cpunum != cpu_number()) {
panic("%s: running cpu is at apic %d"
- " instead of at expected %d\n",
+ " instead of at expected %d",
self->dv_xname, cpu_number(), cpunum);
}
@@ -303,7 +303,7 @@ cpu_attach(parent, self, aux)
break;
default:
- panic("unknown processor type??\n");
+ panic("unknown processor type??");
}
/* Mark this ID as taken if it's in the I/O APIC ID area */
diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c
index ff61d282f6c..ae005df469c 100644
--- a/sys/arch/i386/i386/mpbios.c
+++ b/sys/arch/i386/i386/mpbios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpbios.c,v 1.3 2004/06/23 17:14:31 niklas Exp $ */
+/* $OpenBSD: mpbios.c,v 1.4 2005/07/18 02:43:25 fgsch Exp $ */
/* $NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $ */
/*-
@@ -934,7 +934,7 @@ mpbios_bus(ent, self)
* from underneath us
*/
if (bus_id >= mp_nbus) {
- panic("%s: bus number %d out of range?? (type %6.6s)\n",
+ panic("%s: bus number %d out of range?? (type %6.6s)",
self->dv_xname, bus_id, entry->bus_type);
}
#endif
diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h
index c92469dcf7b..044ab5087ad 100644
--- a/sys/arch/i386/include/mutex.h
+++ b/sys/arch/i386/include/mutex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.h,v 1.2 2005/04/08 07:07:06 jolan Exp $ */
+/* $OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -43,13 +43,13 @@ struct mutex {
#define MUTEX_ASSERT_LOCKED(mtx) do { \
if ((mtx)->mtx_lock != 1 || \
(mtx)->mtx_owner != curcpu()) \
- panic("mutex %p not held in %s\n", (mtx), __func__); \
+ panic("mutex %p not held in %s", (mtx), __func__); \
} while (0)
#define MUTEX_ASSERT_UNLOCKED(mtx) do { \
if ((mtx)->mtx_lock == 1 && \
(mtx)->mtx_owner == curcpu()) \
- panic("mutex %p held in %s\n", (mtx), __func__); \
+ panic("mutex %p held in %s", (mtx), __func__); \
} while (0)
#define MUTEX_OLDIPL(mtx) (mtx)->mtx_oldipl
diff --git a/sys/arch/luna88k/luna88k/isr.c b/sys/arch/luna88k/luna88k/isr.c
index d619b7b8113..b48ac261b68 100644
--- a/sys/arch/luna88k/luna88k/isr.c
+++ b/sys/arch/luna88k/luna88k/isr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isr.c,v 1.4 2004/12/25 23:02:24 miod Exp $ */
+/* $OpenBSD: isr.c,v 1.5 2005/07/18 02:43:25 fgsch Exp $ */
/* $NetBSD: isr.c,v 1.5 2000/07/09 08:08:20 nisimura Exp $ */
/*-
@@ -158,7 +158,7 @@ isrdispatch_autovec(int ipl)
#ifdef DIAGNOSTIC
if (ipl < 0 || ipl >= NISRAUTOVEC)
- panic("isrdispatch_autovec: bad ipl 0x%d\n", ipl);
+ panic("isrdispatch_autovec: bad ipl 0x%d", ipl);
#endif
#if 0 /* XXX: already counted in machdep.c */
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c
index eccae605de7..2a294b8942e 100644
--- a/sys/arch/mac68k/dev/esp.c
+++ b/sys/arch/mac68k/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.20 2004/12/10 18:23:23 martin Exp $ */
+/* $OpenBSD: esp.c,v 1.21 2005/07/18 02:43:25 fgsch Exp $ */
/* $NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $ */
/*
@@ -509,7 +509,7 @@ esp_quick_dma_intr(sc)
int trans=0, resid=0;
if (esc->sc_active == 0)
- panic("dma_intr--inactive DMA\n");
+ panic("dma_intr--inactive DMA");
esc->sc_active = 0;
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index 9ec488eb381..e6d57c52063 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.15 2005/06/07 02:29:30 henning Exp $ */
+/* $OpenBSD: interrupt.c,v 1.16 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -342,7 +342,7 @@ static int initialized = 0;
}
if (irq > 62 || irq < 1) {
- panic("intr_establish: illegal irq %d\n", irq);
+ panic("intr_establish: illegal irq %d", irq);
}
irq += 1; /* Adjust for softint 1 and 0 */
diff --git a/sys/arch/mvme88k/dev/bussw.c b/sys/arch/mvme88k/dev/bussw.c
index 67adc2d4667..1258509c9c3 100644
--- a/sys/arch/mvme88k/dev/bussw.c
+++ b/sys/arch/mvme88k/dev/bussw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bussw.c,v 1.15 2004/07/30 19:02:05 miod Exp $ */
+/* $OpenBSD: bussw.c,v 1.16 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
*
@@ -178,7 +178,7 @@ busswintr_establish(int vec, struct intrhand *ih, const char *name)
{
#ifdef DIAGNOSTIC
if (vec < 0 || vec >= BS_NVEC)
- panic("busswintr_establish: illegal vector 0x%x\n", vec);
+ panic("busswintr_establish: illegal vector 0x%x", vec);
#endif
return intr_establish(BS_VECBASE + vec, ih, name);
diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c
index 1666c8e2009..f1b82b345e4 100644
--- a/sys/arch/mvme88k/dev/pcctwo.c
+++ b/sys/arch/mvme88k/dev/pcctwo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcctwo.c,v 1.26 2004/07/30 19:02:06 miod Exp $ */
+/* $OpenBSD: pcctwo.c,v 1.27 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
* All rights reserved.
@@ -188,7 +188,7 @@ pcctwointr_establish(int vec, struct intrhand *ih, const char *name)
{
#ifdef DIAGNOSTIC
if (vec < 0 || vec >= PCC2_NVEC)
- panic("pcctwo_establish: illegal vector 0x%x\n", vec);
+ panic("pcctwo_establish: illegal vector 0x%x", vec);
#endif
return intr_establish(PCC2_VECBASE + vec, ih, name);
diff --git a/sys/arch/mvme88k/dev/syscon.c b/sys/arch/mvme88k/dev/syscon.c
index 4c74cccebec..4a09e3998fd 100644
--- a/sys/arch/mvme88k/dev/syscon.c
+++ b/sys/arch/mvme88k/dev/syscon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscon.c,v 1.22 2004/08/02 08:35:00 miod Exp $ */
+/* $OpenBSD: syscon.c,v 1.23 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* All rights reserved.
@@ -165,7 +165,7 @@ sysconintr_establish(int vec, struct intrhand *ih, const char *name)
{
#ifdef DIAGNOSTIC
if (vec < 0 || vec >= SYSCON_NVEC)
- panic("sysconintr_establish: illegal vector 0x%x\n", vec);
+ panic("sysconintr_establish: illegal vector 0x%x", vec);
#endif
return intr_establish(SYSCON_VECT + vec, ih, name);
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index d91bcb58da2..1e65422c093 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macebus.c,v 1.11 2005/01/31 21:35:50 grange Exp $ */
+/* $OpenBSD: macebus.c,v 1.12 2005/07/18 02:43:25 fgsch Exp $ */
/*
* Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se)
@@ -463,7 +463,7 @@ macebus_intr_establish(void *icp, u_long irq, int type, int level,
}
if (irq > 62 || irq < 1) {
- panic("intr_establish: illegal irq %d\n", irq);
+ panic("intr_establish: illegal irq %d", irq);
}
irq -= 1; /* Adjust for 1 being first (0 is no int) */
diff --git a/sys/arch/solbourne/solbourne/trap.c b/sys/arch/solbourne/solbourne/trap.c
index 33222dfa6ee..a6cbdc71625 100644
--- a/sys/arch/solbourne/solbourne/trap.c
+++ b/sys/arch/solbourne/solbourne/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.2 2005/04/21 04:39:35 mickey Exp $ */
+/* $OpenBSD: trap.c,v 1.3 2005/07/18 02:43:26 fgsch Exp $ */
/* OpenBSD: trap.c,v 1.42 2004/12/06 20:12:25 miod Exp */
/*
@@ -702,7 +702,7 @@ mem_access_fault(type, ser, v, pc, psr, tf)
* or a bus timeout.
* XXX should restart the operation if retry timeout.
*/
- panic("data fault: fcr %b isr %b pc %08x addr %08x fpar %08x fpsr %08x\n",
+ panic("data fault: fcr %b isr %b pc %08x addr %08x fpar %08x fpsr %08x",
ser, FCR_BITS, isr, ISR_BITS,
pc, v, lda(0, ASI_FPAR), lda(0, ASI_FPSR));
}
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 7643c42aeda..2c42cefeef9 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx.c,v 1.26 2005/02/20 15:35:34 miod Exp $ */
+/* $OpenBSD: aic79xx.c,v 1.27 2005/07/18 02:43:26 fgsch Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1481,7 +1481,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
break;
}
default:
- panic("Unexpected TaskMgmt Func\n");
+ panic("Unexpected TaskMgmt Func");
break;
}
}
@@ -2037,7 +2037,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
printf("LQIRETRY for LQIPHASE_NLQ\n");
ahd_outb(ahd, LQCTL2, LQIRETRY);
} else
- panic("ahd_handle_lqiphase_error: No phase errors\n");
+ panic("ahd_handle_lqiphase_error: No phase errors");
ahd_dump_card_state(ahd);
ahd_outb(ahd, CLRINT, CLRSCSIINT);
ahd_unpause(ahd);
@@ -7327,7 +7327,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("qinpos = %d, SCB index = %d\n",
qinpos, ahd->qinfifo[qinpos]);
- panic("Loop 1\n");
+ panic("Loop 1");
}
if (ahd_match_scb(ahd, scb, target, channel, lun, tag, role)) {
@@ -7399,7 +7399,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("%s: SCB = 0x%x Not Active!\n",
ahd_name(ahd), scbid);
- panic("Waiting TID List traversal\n");
+ panic("Waiting TID List traversal");
}
ahd_set_scbptr(ahd, scbid);
tid_next = ahd_inw_scbram(ahd, SCB_NEXT2);
@@ -7525,7 +7525,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("%s: SCB = %d Not Active!\n",
ahd_name(ahd), scbid);
- panic("Waiting List traversal\n");
+ panic("Waiting List traversal");
}
ahd_set_scbptr(ahd, scbid);
*list_tail = scbid;
@@ -8312,7 +8312,7 @@ ahd_calc_residual(struct ahd_softc *ahd, struct scb *scb)
aic_freeze_scb(scb);
return;
} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
- panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
+ panic("Bogus resid sgptr value 0x%x", resid_sgptr);
/* NOTREACHED */
} else {
struct ahd_dma_seg *sg;
@@ -10073,7 +10073,7 @@ ahd_update_scsiid(struct ahd_softc *ahd, u_int targid_mask)
u_int scsiid;
if ((ahd->features & AHD_MULTI_TID) == 0)
- panic("ahd_update_scsiid called on non-multitid unit\n");
+ panic("ahd_update_scsiid called on non-multitid unit");
/*
* Since we will rely on the TARGID mask
@@ -10375,7 +10375,7 @@ ahd_set_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
#ifdef AHD_DEBUG
if (ahd->src_mode == AHD_MODE_UNKNOWN
|| ahd->dst_mode == AHD_MODE_UNKNOWN)
- panic("Setting mode prior to saving it.\n");
+ panic("Setting mode prior to saving it.");
if ((ahd_debug & AHD_SHOW_MODEPTR) != 0)
printf("%s: Setting mode 0x%x\n", ahd_name(ahd),
ahd_build_mode_state(ahd, src, dst));
@@ -10408,7 +10408,7 @@ ahd_assert_modes(struct ahd_softc *ahd, ahd_mode srcmode,
#ifdef AHD_DEBUG
if ((srcmode & AHD_MK_MSK(ahd->src_mode)) == 0
|| (dstmode & AHD_MK_MSK(ahd->dst_mode)) == 0) {
- panic("%s:%s:%d: Mode assertion failed.\n",
+ panic("%s:%s:%d: Mode assertion failed.",
ahd_name(ahd), file, line);
}
#endif
@@ -10961,7 +10961,7 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb)
ahd_swap_with_next_hscb(ahd, scb);
if (SCBID_IS_NULL(SCB_GET_TAG(scb)))
- panic("Attempt to queue invalid SCB tag %x\n",
+ panic("Attempt to queue invalid SCB tag %x",
SCB_GET_TAG(scb));
/*
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index ab0f2eeef94..cea6a30c940 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.c,v 1.65 2005/06/01 21:49:53 miod Exp $ */
+/* $OpenBSD: aic7xxx.c,v 1.66 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -40,7 +40,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.65 2005/06/01 21:49:53 miod Exp $
+ * $Id: aic7xxx.c,v 1.66 2005/07/18 02:43:26 fgsch Exp $
*/
/*
* Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -6098,7 +6098,7 @@ ahc_calc_residual(struct ahc_softc *ahc, struct scb *scb)
/* Case 4 */
return;
} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
- panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
+ panic("Bogus resid sgptr value 0x%x", resid_sgptr);
} else {
struct ahc_dma_seg *sg;
diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h
index 02b6e137d40..5ddc5c6b157 100644
--- a/sys/dev/ic/aic7xxx_inline.h
+++ b/sys/dev/ic/aic7xxx_inline.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_inline.h,v 1.10 2005/06/01 21:49:54 miod Exp $ */
+/* $OpenBSD: aic7xxx_inline.h,v 1.11 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: aic7xxx_inline.h,v 1.4 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -471,7 +471,7 @@ ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb)
if (scb->hscb->tag == SCB_LIST_NULL
|| scb->hscb->next == SCB_LIST_NULL)
- panic("Attempt to queue invalid SCB tag %x:%x\n",
+ panic("Attempt to queue invalid SCB tag %x:%x",
scb->hscb->tag, scb->hscb->next);
/*
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 7f8a59b2500..c1f0443932b 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.29 2005/05/28 23:45:10 reyk Exp $ */
+/* $OpenBSD: ath.c,v 1.30 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -655,7 +655,7 @@ ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan)
case IEEE80211_MODE_TURBO:
return CHANNEL_T;
default:
- panic("%s: unsupported mode %d\n", __func__, mode);
+ panic("%s: unsupported mode %d", __func__, mode);
return 0;
}
}
@@ -2797,7 +2797,7 @@ ath_state_to_led(enum ieee80211_state state)
case IEEE80211_S_RUN:
return HAL_LED_RUN;
default:
- panic("%s: unknown 802.11 state %d\n", __func__, state);
+ panic("%s: unknown 802.11 state %d", __func__, state);
return HAL_LED_INIT;
}
}
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index f5a0b637ac1..a06c15e25e6 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atw.c,v 1.33 2005/07/02 23:10:16 brad Exp $ */
+/* $OpenBSD: atw.c,v 1.34 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */
/*-
@@ -1478,7 +1478,7 @@ atw_tune(struct atw_softc *sc)
chan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan);
if (chan == IEEE80211_CHAN_ANY)
- panic("%s: chan == IEEE80211_CHAN_ANY\n", __func__);
+ panic("%s: chan == IEEE80211_CHAN_ANY", __func__);
if (chan == sc->sc_cur_chan)
return 0;
@@ -2569,7 +2569,7 @@ atw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
case IEEE80211_S_ASSOC:
break;
case IEEE80211_S_INIT:
- panic("%s: unexpected state IEEE80211_S_INIT\n", __func__);
+ panic("%s: unexpected state IEEE80211_S_INIT", __func__);
break;
case IEEE80211_S_SCAN:
timeout_add(&sc->sc_scan_to, atw_dwelltime * hz / 1000);
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index a51c66418b2..2bd416e20dd 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtw.c,v 1.34 2005/06/15 01:33:50 jsg Exp $ */
+/* $OpenBSD: rtw.c,v 1.35 2005/07/18 02:43:27 fgsch Exp $ */
/* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
/*-
@@ -1284,7 +1284,7 @@ rtw_intr_rx(struct rtw_softc *sc, u_int16_t isr)
goto next;
default:
/* XXX shorten rx ring, instead? */
- panic("%s: could not load DMA map\n",
+ panic("%s: could not load DMA map",
sc->sc_dev.dv_xname);
}
@@ -2059,7 +2059,7 @@ rtw_tune(struct rtw_softc *sc)
chan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan);
if (chan == IEEE80211_CHAN_ANY)
- panic("%s: chan == IEEE80211_CHAN_ANY\n", __func__);
+ panic("%s: chan == IEEE80211_CHAN_ANY", __func__);
if (chan == sc->sc_cur_chan) {
RTW_DPRINTF(RTW_DEBUG_TUNE,
@@ -3169,7 +3169,7 @@ rtw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
switch (nstate) {
case IEEE80211_S_INIT:
- panic("%s: unexpected state IEEE80211_S_INIT\n", __func__);
+ panic("%s: unexpected state IEEE80211_S_INIT", __func__);
break;
case IEEE80211_S_SCAN:
if (ostate != IEEE80211_S_SCAN) {
diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c
index 714d48345c2..5ae390f9b7f 100644
--- a/sys/dev/pci/ami_pci.c
+++ b/sys/dev/pci/ami_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami_pci.c,v 1.26 2005/06/05 23:34:00 marco Exp $ */
+/* $OpenBSD: ami_pci.c,v 1.27 2005/07/18 02:43:27 fgsch Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -287,7 +287,7 @@ ami_pci_attach(parent, self, aux)
}
else {
/* this device existed at _match() should never happen */
- panic("ami device dissapeared between match() and attach()\n");
+ panic("ami device dissapeared between match() and attach()");
}
printf(" %s/%s\n%s", model, lhc, sc->sc_dev.dv_xname);
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 989faa7e07a..7f8fecb669d 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_subr.c,v 1.36 2005/04/21 08:47:57 pascoe Exp $ */
+/* $OpenBSD: usb_subr.c,v 1.37 2005/07/18 02:43:27 fgsch Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -1055,7 +1055,7 @@ usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth,
goto found;
}
}
- panic("usbd_new_device: cannot find HS port\n");
+ panic("usbd_new_device: cannot find HS port");
found:
DPRINTFN(1,("usbd_new_device: high speed port %d\n", p));
} else {
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 90624eb930d..b38ff081d2b 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket2.c,v 1.39 2005/05/27 17:16:13 dhartmei Exp $ */
+/* $OpenBSD: uipc_socket2.c,v 1.40 2005/07/18 02:43:27 fgsch Exp $ */
/* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */
/*
@@ -815,7 +815,7 @@ sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n)
if (n)
n->m_flags |= eor;
else
- printf("semi-panic: sbcompress\n");
+ printf("semi-panic: sbcompress");
}
SBLASTMBUFCHK(sb, __func__);
}
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 9e52d6de6e7..720b5162178 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.h,v 1.2 2004/10/01 04:08:46 jsg Exp $ */
+/* $OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:27 fgsch Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -83,12 +83,12 @@ void mtx_init1(struct mutex *, int);
#ifdef DIAGNOSTIC
#define MUTEX_ASSERT_LOCKED(mtx) do { \
if ((mtx)->mtx_lock == 0) \
- panic("mutex %p not held in %s\n", (mtx), __func__); \
+ panic("mutex %p not held in %s", (mtx), __func__); \
} while (0)
#define MUTEX_ASSERT_UNLOCKED(mtx) do { \
if ((mtx)->mtx_lock != 0) \
- panic("mutex %p held in %s\n", (mtx), __func__); \
+ panic("mutex %p held in %s", (mtx), __func__); \
} while (0)
#else
#define MUTEX_ASSERT_LOCKED(mtx) do { } while (0)