d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kern_shutdown.c was more ANSI-C than K&R - remove the remnants of K&R

Browse Source 
support with extreme prejudice.
This commit is contained in:
Peter Wemm 2000-09-03 06:44:53 +00:00
parent 87de370376
commit 82acbcf57b
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/kern/kern_shutdown.c
View File

@ -107,14 +107,12 @@ watchdog_tickle_fn wdog_tickler = NULL;
*/ */
const char *panicstr; const char *panicstr;
static void boot __P((int)) __dead2; static void boot(int) __dead2;
static void dumpsys __P((void)); static void dumpsys(void);
static int setdumpdev __P((dev_t dev)); static void poweroff_wait(void *, int);
static void poweroff_wait __P((void *, int)); static void shutdown_halt(void *junk, int howto);
static void print_uptime __P((void)); static void shutdown_panic(void *junk, int howto);
static void shutdown_halt __P((void *junk, int howto)); static void shutdown_reset(void *junk, int howto);
static void shutdown_panic __P((void *junk, int howto));
static void shutdown_reset __P((void *junk, int howto));
/* register various local shutdown events */ /* register various local shutdown events */
static void static void
@ -134,9 +132,7 @@ SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL)
* The system call that results in a reboot * The system call that results in a reboot
*/ */
int int
reboot(p, uap) reboot(struct proc *p, struct reboot_args *uap)
struct proc *p;
struct reboot_args *uap;
{ {
int error; int error;
@ -170,7 +166,7 @@ static int waittime = -1;
static struct pcb dumppcb; static struct pcb dumppcb;
static void static void
print_uptime() print_uptime(void)
{ {
int f; int f;
struct timespec ts; struct timespec ts;
@ -202,17 +198,15 @@ print_uptime()
* anything machine dependant in it. * anything machine dependant in it.
*/ */
static void static void
boot(howto) boot(int howto)
int howto;
{ {
/* collect extra flags that shutdown_nice might have set */ /* collect extra flags that shutdown_nice might have set */
howto |= shutdown_howto; howto |= shutdown_howto;
#ifdef SMP #ifdef SMP
if (smp_active) { if (smp_active)
printf("boot() called on cpu#%d\n", cpuid); printf("boot() called on cpu#%d\n", cpuid);
}
#endif #endif
/* /*
* Do any callouts that should be done BEFORE syncing the filesystems. * Do any callouts that should be done BEFORE syncing the filesystems.
@ -397,8 +391,7 @@ SYSCTL_INT(_machdep, OID_AUTO, do_dump, CTLFLAG_RW, &dodump, 0,
"Try to perform coredump on kernel panic"); "Try to perform coredump on kernel panic");
static int static int
setdumpdev(dev) setdumpdev(dev_t dev)
dev_t dev;
{ {
int psize; int psize;
long newdumplo; long newdumplo;
@ -427,10 +420,8 @@ setdumpdev(dev)
/* ARGSUSED */ /* ARGSUSED */
static void dump_conf __P((void *dummy));
static void static void
dump_conf(dummy) dump_conf(void *dummy)
void *dummy;
{ {
if (setdumpdev(dumpdev) != 0) if (setdumpdev(dumpdev) != 0)
dumpdev = NODEV; dumpdev = NODEV;