Module Name: src Committed By: tsutsui Date: Sun May 15 16:57:08 UTC 2011
Modified Files: src/sys/arch/hp300/hp300: machdep.c Log Message: Misc KNF. To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/sys/arch/hp300/hp300/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/hp300/hp300/machdep.c diff -u src/sys/arch/hp300/hp300/machdep.c:1.220 src/sys/arch/hp300/hp300/machdep.c:1.221 --- src/sys/arch/hp300/hp300/machdep.c:1.220 Tue May 10 14:38:08 2011 +++ src/sys/arch/hp300/hp300/machdep.c Sun May 15 16:57:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.220 2011/05/10 14:38:08 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.221 2011/05/15 16:57:08 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.220 2011/05/10 14:38:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.221 2011/05/15 16:57:08 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -320,7 +320,7 @@ * Allocate a submap for physio */ phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, - VM_PHYS_SIZE, 0, false, NULL); + VM_PHYS_SIZE, 0, false, NULL); #ifdef DEBUG pmapdebug = opmapdebug; @@ -587,16 +587,16 @@ { sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "machdep", NULL, - NULL, 0, NULL, 0, - CTL_MACHDEP, CTL_EOL); + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "machdep", NULL, + NULL, 0, NULL, 0, + CTL_MACHDEP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_STRUCT, "console_device", NULL, - sysctl_consdev, 0, NULL, sizeof(dev_t), - CTL_MACHDEP, CPU_CONSDEV, CTL_EOL); + CTLFLAG_PERMANENT, + CTLTYPE_STRUCT, "console_device", NULL, + sysctl_consdev, 0, NULL, sizeof(dev_t), + CTL_MACHDEP, CPU_CONSDEV, CTL_EOL); } int waittime = -1; @@ -657,7 +657,7 @@ printf("rebooting...\n"); DELAY(1000000); doboot(); - /*NOTREACHED*/ + /* NOTREACHED */ } /* @@ -943,13 +943,13 @@ int i; label_t faultbuf; - nofault = (int *) &faultbuf; + nofault = (int *)&faultbuf; if (setjmp((label_t *)nofault)) { - nofault = (int *) 0; + nofault = (int *)0; return 1; } i = *(volatile short *)addr; - nofault = (int *) 0; + nofault = (int *)0; return 0; } @@ -959,9 +959,9 @@ int i; label_t faultbuf; - nofault = (int *) &faultbuf; + nofault = (int *)&faultbuf; if (setjmp((label_t *)nofault)) { - nofault = (int *) 0; + nofault = (int *)0; return 1; } i = *(volatile char *)addr; @@ -1056,14 +1056,14 @@ { label_t faultbuf; - nofault = (int *) &faultbuf; + nofault = (int *)&faultbuf; if (setjmp((label_t *)nofault)) { - nofault = (int *) 0; + nofault = (int *)0; printf("Parity detection disabled\n"); return; } *PARREG = 1; - nofault = (int *) 0; + nofault = (int *)0; gotparmem = 1; } @@ -1088,7 +1088,7 @@ else if (USERMODE(fp->f_sr)) { printf("pid %d: parity error\n", curproc->p_pid); uprintf("sorry, pid %d killed due to memory parity error\n", - curproc->p_pid); + curproc->p_pid); psignal(curproc, SIGKILL); #ifdef DEBUG } else if (ignorekperr) { @@ -1159,7 +1159,7 @@ */ printf("Couldn't locate parity error\n"); found = 0; -done: + done: looking = 0; pmap_remove(pmap_kernel(), (vaddr_t)vmmap, (vaddr_t)&vmmap[PAGE_SIZE]); pmap_update(pmap_kernel());