1
0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00

No "\n" needed at the end of panic() strings.

Bogus chunks pointed out by matthew@ and miod@. No cookies for
marco@ and jasper@.

ok deraadt@ miod@ matthew@ jasper@ macro@
This commit is contained in:
krw 2010-08-07 03:50:01 +00:00
parent cf04bd2943
commit 859d5ed4e9
54 changed files with 143 additions and 143 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pci_550.c,v 1.21 2009/09/30 20:16:30 miod Exp $ */
/* $OpenBSD: pci_550.c,v 1.22 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
/*-
@ -398,7 +398,7 @@ dec_550_iointr(arg, vec)
irq = SCB_VECTOIDX(vec - 0x900);
if (irq >= DEC_550_MAX_IRQ)
panic("550_iointr: vec 0x%lx out of range\n", vec);
panic("550_iointr: vec 0x%lx out of range", vec);
if (!alpha_shared_intr_dispatch(dec_550_pci_intr, irq)) {
alpha_shared_intr_stray(dec_550_pci_intr, irq,

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pciide_machdep.c,v 1.1 2006/05/29 17:13:19 drahn Exp $ */
/* $OpenBSD: pciide_machdep.c,v 1.2 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $ */
/*
@ -54,12 +54,12 @@ void *
pciide_machdep_compat_intr_establish(struct device *dev,
struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
panic("pciide_machdep_compat_intr_establish called\n");
panic("pciide_machdep_compat_intr_establish called");
return (NULL);
}
void
pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
{
panic("pciide_machdep_compat_intr_disestablish called\n");
panic("pciide_machdep_compat_intr_disestablish called");
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: gptimer.c,v 1.3 2010/02/22 23:16:47 drahn Exp $ */
/* $OpenBSD: gptimer.c,v 1.4 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@ -177,7 +177,7 @@ gptimer_attach(struct device *parent, struct device *self, void *args)
tc_init(&gptimer_timecounter);
}
else
panic("attaching too many gptimers at %x\n", aa->aa_addr);
panic("attaching too many gptimers at %x", aa->aa_addr);
}
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: intc.c,v 1.2 2010/06/01 03:11:43 drahn Exp $ */
/* $OpenBSD: intc.c,v 1.3 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@ -424,7 +424,7 @@ intc_intr_establish(int irqno, int level, int (*func)(void *),
struct intrhand *ih;
if (irqno < 0 || irqno > NIRQ)
panic("intc_intr_establish: bogus irqnumber %d: %s\n",
panic("intc_intr_establish: bogus irqnumber %d: %s",
irqno, name);
psw = disable_interrupts(I32_bit);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: omdisplay.c,v 1.1 2009/05/08 03:13:26 drahn Exp $ */
/* $OpenBSD: omdisplay.c,v 1.2 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
*
@ -1010,7 +1010,7 @@ omdisplay_initialize(struct omdisplay_softc *sc,
mode = DISPC_GFX_ATTRIBUTES_GFXFMT_24;
break;
default:
panic("invalid depth %d\n", geom->depth);
panic("invalid depth %d", geom->depth);
}
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_GFX_ATTRIBUTES,
DISPC_GFX_ATTRIBUTES_GFXENABLE | mode |

View File

@ -1,4 +1,4 @@
/* $OpenBSD: omgpio.c,v 1.2 2010/05/09 15:46:17 jasper Exp $ */
/* $OpenBSD: omgpio.c,v 1.3 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@ -306,13 +306,13 @@ omgpio_intr_establish(unsigned int gpio, int level, int spl,
*/
if (GPIO_PIN_TO_INST(gpio) > NOMGPIO)
panic("omgpio_intr_establish: bogus irqnumber %d: %s\n",
panic("omgpio_intr_establish: bogus irqnumber %d: %s",
gpio, name);
sc = omgpio_cd.cd_devs[GPIO_PIN_TO_INST(gpio)];
if (sc->sc_handlers[GPIO_PIN_TO_OFFSET(gpio)] != NULL)
panic("omgpio_intr_establish: gpio pin busy %d old %s new %s\n",
panic("omgpio_intr_establish: gpio pin busy %d old %s new %s",
gpio, sc->sc_handlers[GPIO_PIN_TO_OFFSET(gpio)]->ih_name,
name);
@ -388,7 +388,7 @@ omgpio_irq(void *v)
ih->ih_count.ec_count++;
omgpio_clear_intr(ih->ih_gpio);
} else {
panic("omgpio: irq fired no handler, gpio %x %x %x\n",
panic("omgpio: irq fired no handler, gpio %x %x %x",
sc->sc_dev.dv_unit * 32 + bit, pending,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, GPIO_IRQENABLE1)

View File

@ -1,4 +1,4 @@
/* $OpenBSD: prcm.c,v 1.3 2010/02/12 05:31:11 drahn Exp $ */
/* $OpenBSD: prcm.c,v 1.4 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@ -258,7 +258,7 @@ prcm_setclock(int clock, int speed)
bus_space_write_4(prcm_iot, prcm_ioh, CM_CLKSEL_PER, reg);
} else
panic("prcm_setclock invalid clock %d\n", clock);
panic("prcm_setclock invalid clock %d", clock);
#endif
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_le.c,v 1.5 2006/08/17 06:31:10 miod Exp $ */;
/* $OpenBSD: if_le.c,v 1.6 2010/08/07 03:50:01 krw Exp $ */;
/* $NetBSD: if_le.c,v 1.9 1997/01/30 10:32:54 thorpej Exp $ */
/*
@ -249,7 +249,7 @@ le_error(int unit, char *str, u_short stat)
if (stat & LE_MISS)
le_stats[unit].missed++;
if (stat & LE_MERR) {
panic("le%d: memory error in '%s'\n", unit, str);
panic("le%d: memory error in '%s'", unit, str);
}
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: apic.c,v 1.10 2010/05/24 15:04:53 deraadt Exp $ */
/* $OpenBSD: apic.c,v 1.11 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@ -110,7 +110,7 @@ apic_attach(struct elroy_softc *sc)
sc->sc_irq = malloc(sc->sc_nints * sizeof(int), M_DEVBUF,
M_NOWAIT | M_ZERO);
if (sc->sc_irq == NULL)
panic("apic_attach: cannot allocate irq table\n");
panic("apic_attach: cannot allocate irq table");
apic_get_int_tbl(sc);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: astro.c,v 1.11 2010/05/24 15:04:53 deraadt Exp $ */
/* $OpenBSD: astro.c,v 1.12 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007 Mark Kettenis
@ -669,7 +669,7 @@ iommu_iomap_translate(struct iommu_map_state *ims, paddr_t pa)
e = SPLAY_FIND(iommu_page_tree, &ipm->ipm_tree, &pe);
if (e == NULL) {
panic("couldn't find pa %lx\n", pa);
panic("couldn't find pa %lx", pa);
return 0;
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: fpu.c,v 1.4 2010/07/02 05:04:33 jsing Exp $ */
/* $OpenBSD: fpu.c,v 1.5 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2010 Joel Sing <jsing@openbsd.org>
@ -62,7 +62,7 @@ fpu_proc(struct proc *p, int save)
if (fpuci != ci) {
if (hppa_ipi_send(fpuci, HPPA_IPI_FPU_SAVE))
panic("FPU shootdown failed!\n");
panic("FPU shootdown failed!");
/*
* The sync is essential here since the volatile on hfp_cpu
@ -109,7 +109,7 @@ fpu_cpu_save(int save)
#ifdef DIAGNOSTIC
if (fpuci != ci)
panic("FPU context is not on this CPU (%p != %p)\n",
panic("FPU context is not on this CPU (%p != %p)",
ci, hfp->hfp_cpu);
#endif

View File

@ -1,4 +1,4 @@
/* $OpenBSD: astro.c,v 1.3 2010/05/24 15:06:03 deraadt Exp $ */
/* $OpenBSD: astro.c,v 1.4 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007 Mark Kettenis
@ -669,7 +669,7 @@ iommu_iomap_translate(struct iommu_map_state *ims, paddr_t pa)
e = SPLAY_FIND(iommu_page_tree, &ipm->ipm_tree, &pe);
if (e == NULL) {
panic("couldn't find pa %lx\n", pa);
panic("couldn't find pa %lx", pa);
return 0;
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: openpic.c,v 1.60 2010/04/09 19:24:17 jasper Exp $ */
/* $OpenBSD: openpic.c,v 1.61 2010/08/07 03:50:01 krw Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@ -666,7 +666,7 @@ openpic_send_ipi(struct cpu_info *ci, int id)
id = 1;
break;
default:
panic("invalid ipi send to cpu %d %d\n", ci->ci_cpuid, id);
panic("invalid ipi send to cpu %d %d", ci->ci_cpuid, id);
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: machdep.c,v 1.120 2010/07/31 21:15:05 kettenis Exp $ */
/* $OpenBSD: machdep.c,v 1.121 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@ -1045,7 +1045,7 @@ intr_send_ipi_t *intr_send_ipi_func = ppc_no_send_ipi;
void
ppc_no_send_ipi(struct cpu_info *ci, int id)
{
panic("ppc_send_ipi called: no ipi function\n");
panic("ppc_send_ipi called: no ipi function");
}
void

View File

@ -1,4 +1,4 @@
/* $OpenBSD: cpu.c,v 1.30 2010/06/26 23:24:43 guenther Exp $ */
/* $OpenBSD: cpu.c,v 1.31 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se)
@ -89,7 +89,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
cpu_info_secondaries = (struct cpu_info *)alloc_contiguous_pages(
sizeof(struct cpu_info) * ncpusfound - 1);
if (cpu_info_secondaries == NULL)
panic("unable to allocate cpu_info\n");
panic("unable to allocate cpu_info");
#endif
}
#ifdef MULTIPROCESSOR

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ipifuncs.c,v 1.4 2010/04/28 16:20:28 syuu Exp $ */
/* $OpenBSD: ipifuncs.c,v 1.5 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: ipifuncs.c,v 1.40 2008/04/28 20:23:10 martin Exp $ */
/*-
@ -82,7 +82,7 @@ mips64_ipi_init(void)
error = hw_ipi_intr_establish(mips64_ipi_intr, cpuid);
if (error)
panic("hw_ipi_intr_establish failed:%d\n", error);
panic("hw_ipi_intr_establish failed:%d", error);
}
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmap.c,v 1.116 2010/07/16 06:22:31 kettenis Exp $ */
/* $OpenBSD: pmap.c,v 1.117 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2001, 2002, 2007 Dale Rahn.
@ -243,7 +243,7 @@ pmap_hash_lock(int entry)
if (pmap_hash_lock_word & (1 << entry)) {
attempt++;
if(attempt >0x20000000)
panic("unable to obtain lock on entry %d\n",
panic("unable to obtain lock on entry %d",
entry);
continue;
}
@ -793,7 +793,7 @@ _pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, int flags, int cache)
/* Do not have pted for this, get one and put it in VP */
if (pted == NULL) {
panic("pted not preallocated in pmap_kernel() va %lx pa %lx\n",
panic("pted not preallocated in pmap_kernel() va %lx pa %lx",
va, pa);
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ip30_machdep.c,v 1.42 2010/04/28 16:20:28 syuu Exp $ */
/* $OpenBSD: ip30_machdep.c,v 1.43 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@ -533,7 +533,7 @@ hw_cpu_boot_secondary(struct cpu_info *ci)
#endif
kstack = alloc_contiguous_pages(USPACE);
if (kstack == NULL)
panic("unable to allocate idle stack\n");
panic("unable to allocate idle stack");
ci->ci_curprocpaddr = (void *)kstack;
*(volatile uint64_t *)(mpconf + MPCONF_STACKADDR(cpuid)) =

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pciide_machdep.c,v 1.1 2006/10/16 21:46:02 drahn Exp $ */
/* $OpenBSD: pciide_machdep.c,v 1.2 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@ -53,12 +53,12 @@ void *
pciide_machdep_compat_intr_establish(struct device *dev,
struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
panic("pciide_machdep_compat_intr_establish called\n");
panic("pciide_machdep_compat_intr_establish called");
return (NULL);
}
void
pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
{
panic("pciide_machdep_compat_intr_disestablish called\n");
panic("pciide_machdep_compat_intr_disestablish called");
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: raptor.c,v 1.6 2009/09/05 14:09:35 miod Exp $ */
/* $OpenBSD: raptor.c,v 1.7 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@ -525,7 +525,7 @@ raptor_init(struct raptor_softc *sc)
I128_BUF_CTRL, I128_BC_PSIZ_32B);
break;
default:
panic("unsupported depth\n");
panic("unsupported depth");
break;
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: viommu.c,v 1.9 2010/04/20 23:26:59 deraadt Exp $ */
/* $OpenBSD: viommu.c,v 1.10 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
@ -160,7 +160,7 @@ viommu_enter(struct iommu_state *is, struct strbuf_ctl *sb, bus_addr_t va,
page_list[0] = trunc_page(pa);
if (!pmap_extract(pmap_kernel(), (vaddr_t)page_list, &addr))
panic("viommu_enter: pmap_extract failed\n");
panic("viommu_enter: pmap_extract failed");
err = hv_pci_iommu_map(is->is_devhandle, tsbid, 1, attr,
addr, &nmapped);
if (err != H_EOK || nmapped != 1)

View File

@ -1,4 +1,4 @@
/* $OpenBSD: vrng.c,v 1.3 2009/01/17 22:38:05 kettenis Exp $ */
/* $OpenBSD: vrng.c,v 1.4 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
@ -119,7 +119,7 @@ vrng_attach(struct device *parent, struct device *self, void *aux)
ctl[3].rng_wait_cnt = 0x3e;
if (!pmap_extract(pmap_kernel(), (vaddr_t)&ctl, &addr))
panic("vrng_attach: pmap_extract failed\n");
panic("vrng_attach: pmap_extract failed");
err = hv_rng_ctl_write(addr, RNG_STATE_CONFIGURED, 0, &delta);
if (err != H_EOK)
@ -142,7 +142,7 @@ vrng_rnd(void *v)
int err;
if (!pmap_extract(pmap_kernel(), (vaddr_t)&rnd, &addr))
panic("vrng_rnd: pmap_extract failed\n");
panic("vrng_rnd: pmap_extract failed");
err = hv_rng_data_read(addr, &delta);
if (err == H_EOK) {
#if 0

View File

@ -1,4 +1,4 @@
/* $OpenBSD: aha1742.c,v 1.41 2010/06/28 18:31:01 krw Exp $ */
/* $OpenBSD: aha1742.c,v 1.42 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/*
@ -339,7 +339,7 @@ ahb_send_mbox(sc, opcode, ecb)
delay(10);
}
if (!wait)
panic("%s: board not responding\n", sc->sc_dev.dv_xname);
panic("%s: board not responding", sc->sc_dev.dv_xname);
/* don't know this will work */
bus_space_write_4(iot, ioh, MBOXOUT0, KVTOPHYS(ecb));
@ -397,7 +397,7 @@ ahb_send_immed(sc, target, cmd)
delay(10);
}
if (!wait)
panic("%s: board not responding\n", sc->sc_dev.dv_xname);
panic("%s: board not responding", sc->sc_dev.dv_xname);
/* don't know this will work */
bus_space_write_4(iot, ioh, MBOXOUT0, cmd);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uha_eisa.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */
/* $OpenBSD: uha_eisa.c,v 1.12 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@ -230,7 +230,7 @@ u24_start_mbox(sc, mscp)
delay(100);
}
if (!spincount)
panic("%s: uha_start_mbox, board not responding\n",
panic("%s: uha_start_mbox, board not responding",
sc->sc_dev.dv_xname);
bus_space_write_4(iot, ioh, U24_OGMPTR, KVTOPHYS(mscp));

View File

@ -1,4 +1,4 @@
/* $OpenBSD: aac.c,v 1.47 2010/06/28 18:31:01 krw Exp $ */
/* $OpenBSD: aac.c,v 1.48 2010/08/07 03:50:01 krw Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@ -423,7 +423,7 @@ aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f)
co = (struct aac_container *)malloc(sizeof *co, M_DEVBUF,
M_NOWAIT);
if (co == NULL)
panic("Out of memory?!\n");
panic("Out of memory?!");
bzero(co, sizeof *co);
AAC_DPRINTF(AAC_D_MISC,
("%s: id %x name '%.16s' size %u type %d\n",
@ -547,7 +547,7 @@ aac_detach(device_t dev)
}
if (sc->aifflags & AAC_AIFFLAGS_RUNNING)
panic("Cannot shutdown AIF thread\n");
panic("Cannot shutdown AIF thread");
if ((error = aac_shutdown(dev)))
return(error);
@ -769,7 +769,7 @@ aac_startio(struct aac_softc *sc)
* catastrophic since it means that bus_dmamap_load() failed.
*/
if (aac_map_command(cm) != 0)
panic("aac: error mapping command %p\n", cm);
panic("aac: error mapping command %p", cm);
AAC_DPRINTF(AAC_D_CMD, ("\n%s: another command",
sc->aac_dev.dv_xname));
@ -1006,7 +1006,7 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp)
opcode = WRITE_COMMAND;
break;
default:
panic("%s: invalid opcode %#x\n", sc->aac_dev.dv_xname,
panic("%s: invalid opcode %#x", sc->aac_dev.dv_xname,
xs->cmd->opcode);
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: acx.c,v 1.95 2009/09/13 14:42:52 krw Exp $ */
/* $OpenBSD: acx.c,v 1.96 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@ -2197,7 +2197,7 @@ acx_encap(struct acx_softc *sc, struct acx_txbuf *txbuf, struct mbuf *m,
int error;
if (txbuf->tb_mbuf != NULL)
panic("free TX buf has mbuf installed\n");
panic("free TX buf has mbuf installed");
error = 0;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: adv.c,v 1.32 2010/06/28 18:31:01 krw Exp $ */
/* $OpenBSD: adv.c,v 1.33 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@ -852,7 +852,7 @@ adv_narrow_isr_callback(sc, qdonep)
bus_dmamap_unload(dmat, ccb->dmamap_xfer);
}
if ((ccb->flags & CCB_ALLOC) == 0) {
panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
panic("%s: exiting ccb not allocated!", sc->sc_dev.dv_xname);
return;
}
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: adw.c,v 1.46 2010/06/28 18:31:01 krw Exp $ */
/* $OpenBSD: adw.c,v 1.47 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@ -1044,7 +1044,7 @@ adw_isr_callback(sc, scsiq)
TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
if ((ccb->flags & CCB_ALLOC) == 0) {
panic("%s: unallocated ccb found on pending list!\n",
panic("%s: unallocated ccb found on pending list!",
sc->sc_dev.dv_xname);
adw_free_ccb(sc, ccb);
return;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: bha.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */
/* $OpenBSD: bha.c,v 1.26 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@ -739,13 +739,13 @@ bha_done(sc, ccb)
*/
#ifdef BHADIAG
if (ccb->flags & CCB_SENDING) {
panic("%s: exiting ccb still in transit!\n",
panic("%s: exiting ccb still in transit!",
sc->sc_dev.dv_xname);
return;
}
#endif
if ((ccb->flags & CCB_ALLOC) == 0) {
panic("%s: exiting ccb not allocated!\n",
panic("%s: exiting ccb not allocated!",
sc->sc_dev.dv_xname);
return;
}
@ -1453,7 +1453,7 @@ bha_timeout(arg)
*/
bha_collect_mbo(sc);
if (ccb->flags & CCB_SENDING)
panic("%s: not taking commands!\n", sc->sc_dev.dv_xname);
panic("%s: not taking commands!", sc->sc_dev.dv_xname);
#endif
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: bwi.c,v 1.93 2010/08/06 05:26:24 mglocker Exp $ */
/* $OpenBSD: bwi.c,v 1.94 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@ -856,7 +856,7 @@ bwi_attach(struct bwi_softc *sc)
error = ENXIO;
goto fail;
} else
panic("unknown phymode %d\n", phy->phy_mode);
panic("unknown phymode %d", phy->phy_mode);
printf(", address %s\n", ether_sprintf(ic->ic_myaddr));
@ -2176,7 +2176,7 @@ bwi_mac_hostflags_init(struct bwi_mac *mac)
if (phy->phy_rev >= 2 && rf->rf_type == BWI_RF_T_BCM2050)
host_flags &= ~BWI_HFLAG_GDC_WA;
} else {
panic("unknown PHY mode %u\n", phy->phy_mode);
panic("unknown PHY mode %u", phy->phy_mode);
}
HFLAGS_WRITE(mac, host_flags);
@ -2276,7 +2276,7 @@ bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rateset *rs)
IEEE80211_MODE_11G) & 0xf) * 2;
break;
default:
panic("unsupported modtype %u\n", modtype);
panic("unsupported modtype %u", modtype);
}
MOBJ_WRITE_2(mac, BWI_COMM_MOBJ, ofs + 0x20,
@ -4264,7 +4264,7 @@ bwi_phy812_value(struct bwi_mac *mac, uint16_t lpd)
case 0x100:
return ((0x2093 | ext_lna));
default:
panic("unsupported lpd\n");
panic("unsupported lpd");
}
} else {
ext_lna |= (loop << 8);
@ -4277,11 +4277,11 @@ bwi_phy812_value(struct bwi_mac *mac, uint16_t lpd)
case 0x100:
return ((0x93 | ext_lna));
default:
panic("unsupported lpd\n");
panic("unsupported lpd");
}
}
panic("never reached\n");
panic("never reached");
return (0);
}
@ -6529,7 +6529,7 @@ bwi_led_event(struct bwi_softc *sc, int event)
rate = 0;
break;
default:
panic("unknown LED event %d\n", event);
panic("unknown LED event %d", event);
break;
}
bwi_led_blink_start(sc, bwi_led_duration[rate].on_dur,
@ -8544,7 +8544,7 @@ bwi_plcp_header(void *plcp, int pkt_len, uint8_t rate)
else if (modtype == IEEE80211_MODTYPE_DS)
bwi_ds_plcp_header(plcp, pkt_len, rate);
else
panic("unsupport modulation type %u\n", modtype);
panic("unsupport modulation type %u", modtype);
}
enum bwi_modtype
@ -8616,7 +8616,7 @@ bwi_ack_rate(struct ieee80211_node *ni, uint8_t rate)
ack_rate = 48;
break;
default:
panic("unsupported rate %d\n", rate);
panic("unsupported rate %d", rate);
}
return ack_rate;
}
@ -9103,7 +9103,7 @@ bwi_regwin_name(const struct bwi_regwin *rw)
case BWI_REGWIN_T_BUSPCIE:
return ("PCIE");
}
panic("unknown regwin type 0x%04x\n", rw->rw_type);
panic("unknown regwin type 0x%04x", rw->rw_type);
return (NULL);
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: mpi.c,v 1.155 2010/07/06 07:18:18 dlg Exp $ */
/* $OpenBSD: mpi.c,v 1.156 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@ -871,7 +871,7 @@ mpi_reply(struct mpi_softc *sc, u_int32_t reg)
break;
default:
panic("%s: unsupported context reply\n",
panic("%s: unsupported context reply",
DEVNAME(sc));
}
}
@ -2416,7 +2416,7 @@ mpi_fwupload(struct mpi_softc *sc)
}
if (ccb->ccb_rcb == NULL)
panic("%s: unable to do fw upload\n", DEVNAME(sc));
panic("%s: unable to do fw upload", DEVNAME(sc));
upp = ccb->ccb_rcb->rcb_reply;
if (letoh16(upp->ioc_status) != MPI_IOCSTATUS_SUCCESS)
@ -2540,7 +2540,7 @@ mpi_req_cfg_header(struct mpi_softc *sc, u_int8_t type, u_int8_t number,
mpi_wait(sc, ccb);
if (ccb->ccb_rcb == NULL)
panic("%s: unable to fetch config header\n", DEVNAME(sc));
panic("%s: unable to fetch config header", DEVNAME(sc));
cp = ccb->ccb_rcb->rcb_reply;
DNPRINTF(MPI_D_MISC, "%s: action: 0x%02x msg_length: %d function: "

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pgt.c,v 1.59 2010/05/19 15:27:35 oga Exp $ */
/* $OpenBSD: pgt.c,v 1.60 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@ -2675,7 +2675,7 @@ badopmode:
DPRINTF(("IEEE80211_MODE_AUTO\n"));
break;
default:
panic("unknown mode %d\n", ic->ic_curmode);
panic("unknown mode %d", ic->ic_curmode);
}
switch (sc->sc_80211_ioc_auth) {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: re.c,v 1.124 2010/07/27 20:53:39 kettenis Exp $ */
/* $OpenBSD: re.c,v 1.125 2010/08/07 03:50:01 krw Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@ -2306,7 +2306,7 @@ re_config_imtype(struct rl_softc *sc, int imtype)
break;
default:
panic("%s: unknown imtype %d\n",
panic("%s: unknown imtype %d",
sc->sc_dev.dv_xname, imtype);
}
}
@ -2339,7 +2339,7 @@ re_setup_intr(struct rl_softc *sc, int enable_intrs, int imtype)
break;
default:
panic("%s: unknown imtype %d\n",
panic("%s: unknown imtype %d",
sc->sc_dev.dv_xname, imtype);
}
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uha.c,v 1.20 2010/06/30 19:06:16 mk Exp $ */
/* $OpenBSD: uha.c,v 1.21 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@ -286,7 +286,7 @@ uha_done(sc, mscp)
* into the xfer and call whoever started it
*/
if ((mscp->flags & MSCP_ALLOC) == 0) {
panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
panic("%s: exiting ccb not allocated!", sc->sc_dev.dv_xname);
return;
}
if (xs->error == XS_NOERROR) {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: aha.c,v 1.72 2010/07/02 02:29:45 tedu Exp $ */
/* $OpenBSD: aha.c,v 1.73 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@ -1415,7 +1415,7 @@ aha_timeout(arg)
*/
aha_collect_mbo(sc);
if (ccb->flags & CCB_SENDING)
panic("%s: not taking commands!\n", sc->sc_dev.dv_xname);
panic("%s: not taking commands!", sc->sc_dev.dv_xname);
#endif
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: arc.c,v 1.90 2010/07/18 12:49:10 mk Exp $ */
/* $OpenBSD: arc.c,v 1.91 2010/08/07 03:50:02 krw Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@ -613,7 +613,7 @@ arc_attach(struct device *parent, struct device *self, void *aux)
#if NBIO > 0
if (bio_register(self, arc_bioctl) != 0)
panic("%s: bioctl registration failed\n", DEVNAME(sc));
panic("%s: bioctl registration failed", DEVNAME(sc));
#ifndef SMALL_KERNEL
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_bge.c,v 1.297 2010/08/02 19:36:13 kettenis Exp $ */
/* $OpenBSD: if_bge.c,v 1.298 2010/08/07 03:50:02 krw Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@ -832,7 +832,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i)
r->bge_bd.bge_len = dmap->dm_segs[0].ds_len;
break;
default:
panic("%s: %d segments\n", __func__, dmap->dm_nsegs);
panic("%s: %d segments", __func__, dmap->dm_nsegs);
}
bus_dmamap_sync(sc->bge_dmatag, sc->bge_ring_map,

View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_che.c,v 1.8 2007/05/30 05:11:53 reyk Exp $ */
/* $OpenBSD: if_che.c,v 1.9 2010/08/07 03:50:02 krw Exp $ */
/*
* Copyright (c) 2007 Claudio Jeker <claudio@openbsd.org>
@ -528,7 +528,7 @@ che_read_flash_multi4(struct cheg_softc *sc, u_int addr, u_int32_t *datap,
int rv;
if (addr + count * sizeof(u_int32_t) > CHE_SF_SIZE || (addr & 3))
panic("%s: che_read_flash_multi4 bad params\n", DEVNAME(sc));
panic("%s: che_read_flash_multi4 bad params", DEVNAME(sc));
addr = swap32(addr) | CHE_SF_RD_DATA;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_jme.c,v 1.22 2010/05/19 15:27:35 oga Exp $ */
/* $OpenBSD: if_jme.c,v 1.23 2010/08/07 03:50:02 krw Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@ -1072,7 +1072,7 @@ jme_encap(struct jme_softc *sc, struct mbuf **m_head)
if (maxsegs > JME_MAXTXSEGS)
maxsegs = JME_MAXTXSEGS;
if (maxsegs < (sc->jme_txd_spare - 1))
panic("%s: not enough segments %d\n", sc->sc_dev.dv_xname,
panic("%s: not enough segments %d", sc->sc_dev.dv_xname,
maxsegs);
error = bus_dmamap_load_mbuf(sc->sc_dmat, txd->tx_dmamap,
@ -1501,7 +1501,7 @@ jme_txeof(struct jme_softc *sc)
txd = &sc->jme_cdata.jme_txdesc[cons];
if (txd->tx_m == NULL)
panic("%s: freeing NULL mbuf!\n", sc->sc_dev.dv_xname);
panic("%s: freeing NULL mbuf!", sc->sc_dev.dv_xname);
status = letoh32(txd->tx_desc->flags);
if ((status & JME_TD_OWN) == JME_TD_OWN)
@ -1536,7 +1536,7 @@ jme_txeof(struct jme_softc *sc)
txd->tx_m = NULL;
sc->jme_cdata.jme_tx_cnt -= txd->tx_ndesc;
if (sc->jme_cdata.jme_tx_cnt < 0)
panic("%s: Active Tx desc counter was garbled\n",
panic("%s: Active Tx desc counter was garbled",
sc->sc_dev.dv_xname);
txd->tx_ndesc = 0;
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: qli_pci.c,v 1.19 2010/06/28 18:31:02 krw Exp $ */
/* $OpenBSD: qli_pci.c,v 1.20 2010/08/07 03:50:02 krw Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2007 David Collins <dave@davec.name>
@ -1045,7 +1045,7 @@ qli_intr(void *arg)
if (intr & QLI_REG_CTRLSTAT_SCSI_COMPL_INTR) {
/* io completion */
/* XXX */
panic("%s: qli_intr io completion not implemented\n",
panic("%s: qli_intr io completion not implemented",
DEVNAME(sc));
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: softraid_raid6.c,v 1.18 2010/07/02 09:20:26 jsing Exp $ */
/* $OpenBSD: softraid_raid6.c,v 1.19 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@ -303,7 +303,7 @@ sr_raid6_set_chunk_state(struct sr_discipline *sd, int c, int new_state)
die:
splx(s); /* XXX */
panic("%s: %s: %s: invalid chunk state transition "
"%d -> %d\n", DEVNAME(sd->sd_sc),
"%d -> %d", DEVNAME(sd->sd_sc),
sd->sd_meta->ssd_devname,
sd->sd_vol.sv_chunks[c]->src_meta.scmi.scm_devname,
old_state, new_state);
@ -433,7 +433,7 @@ sr_raid6_set_vol_state(struct sr_discipline *sd)
default:
die:
panic("%s: %s: invalid volume state transition %d -> %d\n",
panic("%s: %s: invalid volume state transition %d -> %d",
DEVNAME(sd->sd_sc), sd->sd_meta->ssd_devname,
old_state, new_state);
/* NOTREACHED */

View File

@ -1,4 +1,4 @@
/* $OpenBSD: softraid_raidp.c,v 1.18 2010/07/02 09:20:26 jsing Exp $ */
/* $OpenBSD: softraid_raidp.c,v 1.19 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@ -239,7 +239,7 @@ sr_raidp_set_chunk_state(struct sr_discipline *sd, int c, int new_state)
die:
splx(s); /* XXX */
panic("%s: %s: %s: invalid chunk state transition "
"%d -> %d\n", DEVNAME(sd->sd_sc),
"%d -> %d", DEVNAME(sd->sd_sc),
sd->sd_meta->ssd_devname,
sd->sd_vol.sv_chunks[c]->src_meta.scmi.scm_devname,
old_state, new_state);
@ -359,7 +359,7 @@ sr_raidp_set_vol_state(struct sr_discipline *sd)
default:
die:
panic("%s: %s: invalid volume state transition %d -> %d\n",
panic("%s: %s: invalid volume state transition %d -> %d",
DEVNAME(sd->sd_sc), sd->sd_meta->ssd_devname,
old_state, new_state);
/* NOTREACHED */

View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_urtw.c,v 1.29 2010/01/21 21:30:42 miod Exp $ */
/* $OpenBSD: if_urtw.c,v 1.30 2010/08/07 03:50:02 krw Exp $ */
/*-
* Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@ -1309,7 +1309,7 @@ urtw_get_rfchip(struct urtw_softc *sc)
return (0);
fail:
panic("unsupported RF chip %d\n", data & 0xff);
panic("unsupported RF chip %d", data & 0xff);
/* NOTREACHED */
}
@ -1978,7 +1978,7 @@ urtw_led_ctl(struct urtw_softc *sc, int mode)
error = urtw_led_mode3(sc, mode);
break;
default:
panic("unsupported LED mode %d\n", sc->sc_strategy);
panic("unsupported LED mode %d", sc->sc_strategy);
/* NOTREACHED */
}
@ -2055,7 +2055,7 @@ urtw_update_msr(struct urtw_softc *sc)
data |= URTW_MSR_LINK_STA;
break;
default:
panic("unsupported operation mode 0x%x\n",
panic("unsupported operation mode 0x%x",
ic->ic_opmode);
/* NOTREACHED */
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pf_table.c,v 1.84 2010/06/28 18:50:37 claudio Exp $ */
/* $OpenBSD: pf_table.c,v 1.85 2010/08/07 03:50:02 krw Exp $ */
/*
* Copyright (c) 2002 Cedric Berger
@ -830,7 +830,7 @@ pfr_create_kentry(struct pfr_addr *ad)
pfi_kif_ref(ke->pfrke_rkif, PFI_KIF_REF_ROUTE);
break;
default:
panic("unknown pfrke_type %d\n", ke->pfrke_type);
panic("unknown pfrke_type %d", ke->pfrke_type);
break;
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ieee80211.c,v 1.38 2009/11/21 18:09:31 damien Exp $ */
/* $OpenBSD: ieee80211.c,v 1.39 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $ */
/*-
@ -734,7 +734,7 @@ ieee80211_setmode(struct ieee80211com *ic, enum ieee80211_phymode mode)
}
if ((ic->ic_ibss_chan == NULL) || isclr(ic->ic_chan_active,
ieee80211_chan2ieee(ic, ic->ic_ibss_chan)))
panic("Bad IBSS channel %u\n",
panic("Bad IBSS channel %u",
ieee80211_chan2ieee(ic, ic->ic_ibss_chan));
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ieee80211_node.c,v 1.61 2010/07/19 18:53:52 damien Exp $ */
/* $OpenBSD: ieee80211_node.c,v 1.62 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@ -1475,7 +1475,7 @@ ieee80211_node_leave_11g(struct ieee80211com *ic, struct ieee80211_node *ni)
if (!(ni->ni_flags & IEEE80211_NODE_ERP)) {
#ifdef DIAGNOSTIC
if (ic->ic_nonerpsta == 0) {
panic("bogus non-ERP station count %d\n",
panic("bogus non-ERP station count %d",
ic->ic_nonerpsta);
}
#endif

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ieee80211_proto.c,v 1.43 2010/07/28 21:24:52 deraadt Exp $ */
/* $OpenBSD: ieee80211_proto.c,v 1.44 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@ -967,7 +967,7 @@ justcleanup:
case IEEE80211_S_SCAN: /* adhoc/hostap mode */
case IEEE80211_S_ASSOC: /* infra mode */
if (ni->ni_txrate >= ni->ni_rates.rs_nrates)
panic("%s: bogus xmit rate %u setup\n",
panic("%s: bogus xmit rate %u setup",
__func__, ni->ni_txrate);
if (ifp->if_flags & IFF_DEBUG) {
printf("%s: %s with %s ssid ",

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ip6_output.c,v 1.116 2010/07/09 16:58:06 reyk Exp $ */
/* $OpenBSD: ip6_output.c,v 1.117 2010/08/07 03:50:02 krw Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@ -2193,7 +2193,7 @@ ip6_getpcbopt(struct ip6_pktopts *pktopt, int optname, struct mbuf **mp)
break;
default: /* should not happen */
#ifdef DIAGNOSTIC
panic("ip6_getpcbopt: unexpected option\n");
panic("ip6_getpcbopt: unexpected option");
#endif
return (ENOPROTOOPT);
}

View File

@ -1,4 +1,4 @@
/* $OpenBSD: nfs_bio.c,v 1.71 2010/04/12 16:37:38 beck Exp $ */
/* $OpenBSD: nfs_bio.c,v 1.72 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */
/*
@ -219,7 +219,7 @@ again:
on = 0;
break;
default:
panic("nfsbioread: type %x unexpected\n", vp->v_type);
panic("nfsbioread: type %x unexpected", vp->v_type);
break;
}
@ -610,7 +610,7 @@ nfs_doio(struct buf *bp, struct proc *p)
error = nfs_readlinkrpc(vp, uiop, curproc->p_ucred);
break;
default:
panic("nfs_doio: type %x unexpected\n", vp->v_type);
panic("nfs_doio: type %x unexpected", vp->v_type);
break;
};
if (error) {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: nfs_node.c,v 1.51 2009/12/17 16:30:47 beck Exp $ */
/* $OpenBSD: nfs_node.c,v 1.52 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $ */
/*
@ -180,7 +180,7 @@ nfs_inactive(void *v)
return(0);
#ifdef DIAGNOSTIC
if (ap->a_vp->v_data == NULL)
panic("NULL v_data (no nfsnode set up?) in vnode %p\n",
panic("NULL v_data (no nfsnode set up?) in vnode %p",
ap->a_vp);
#endif
np = VTONFS(ap->a_vp);
@ -228,7 +228,7 @@ nfs_reclaim(void *v)
return(0);
#ifdef DIAGNOSTIC
if (ap->a_vp->v_data == NULL)
panic("NULL v_data (no nfsnode set up?) in vnode %p\n",
panic("NULL v_data (no nfsnode set up?) in vnode %p",
ap->a_vp);
#endif
nmp = VFSTONFS(vp->v_mount);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: nfs_syscalls.c,v 1.90 2010/07/31 20:48:32 blambert Exp $ */
/* $OpenBSD: nfs_syscalls.c,v 1.91 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */
/*
@ -398,7 +398,7 @@ loop:
}
if (siz <= 0 || siz > NFS_MAXPACKET)
panic("bad nfs svc reply, siz = %i\n", siz);
panic("bad nfs svc reply, siz = %i", siz);
m = mreq;
m->m_pkthdr.len = siz;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: scsi_base.c,v 1.190 2010/07/28 01:53:12 krw Exp $ */
/* $OpenBSD: scsi_base.c,v 1.191 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@ -1252,9 +1252,9 @@ scsi_xs_sync(struct scsi_xfer *xs)
#ifdef DIAGNOSTIC
if (xs->cookie != NULL)
panic("xs->cookie != NULL in scsi_xs_sync\n");
panic("xs->cookie != NULL in scsi_xs_sync");
if (xs->done != NULL)
panic("xs->done != NULL in scsi_xs_sync\n");
panic("xs->done != NULL in scsi_xs_sync");
#endif
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm_init.c,v 1.27 2010/07/13 16:49:16 deraadt Exp $ */
/* $OpenBSD: uvm_init.c,v 1.28 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: uvm_init.c,v 1.14 2000/06/27 17:29:23 mrg Exp $ */
/*
@ -164,14 +164,14 @@ uvm_init(void)
if (uvm_map(kernel_map, &kvm_start, 3 * PAGE_SIZE,
NULL, UVM_UNKNOWN_OFFSET, 0, UVM_MAPFLAG(UVM_PROT_NONE,
UVM_PROT_NONE, UVM_INH_NONE, UVM_ADV_RANDOM, UVM_FLAG_FIXED)))
panic("uvm_init: cannot reserve dead beef @0x%x\n", DEADBEEF0);
panic("uvm_init: cannot reserve dead beef @0x%x", DEADBEEF0);
#endif
#ifdef DEADBEEF1
kvm_start = trunc_page(DEADBEEF1) - PAGE_SIZE;
if (uvm_map(kernel_map, &kvm_start, 3 * PAGE_SIZE,
NULL, UVM_UNKNOWN_OFFSET, 0, UVM_MAPFLAG(UVM_PROT_NONE,
UVM_PROT_NONE, UVM_INH_NONE, UVM_ADV_RANDOM, UVM_FLAG_FIXED)))
panic("uvm_init: cannot reserve dead beef @0x%x\n", DEADBEEF1);
panic("uvm_init: cannot reserve dead beef @0x%x", DEADBEEF1);
#endif
/*
* init anonymous memory systems

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm_page.c,v 1.101 2010/06/27 03:03:49 thib Exp $ */
/* $OpenBSD: uvm_page.c,v 1.102 2010/08/07 03:50:02 krw Exp $ */
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
/*
@ -267,7 +267,7 @@ uvm_page_init(vaddr_t *kvm_startp, vaddr_t *kvm_endp)
for (lcv = 0 ; lcv < vm_nphysseg ; lcv++) {
n = vm_physmem[lcv].end - vm_physmem[lcv].start;
if (n > pagecount) {
panic("uvm_page_init: lost %ld page(s) in init\n",
panic("uvm_page_init: lost %ld page(s) in init",
(long)(n - pagecount));
/* XXXCDC: shouldn't happen? */
/* n = pagecount; */