diff options
| author |   art <art@openbsd.org> | 2007-05-16 17:27:30 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2007-05-16 17:27:30 +0000 |
| commit | 4931fb57038121001507a030fccbd9f5290b9b1a (patch) | |
| tree | bcc60dcc85bdacec1fefc84fd3f7f380bbeb7254 /sys/kern/init_main.c | |
| parent | we need a cpu_info_store; how did miod miss this? (diff) | |
| download | wireguard-openbsd-4931fb57038121001507a030fccbd9f5290b9b1a.tar.xz wireguard-openbsd-4931fb57038121001507a030fccbd9f5290b9b1a.zip | |
The world of __HAVEs and __HAVE_NOTs is reducing. All architectures
have cpu_info now, so kill the option.
eyeballed by jsg@ and grange@
Diffstat (limited to 'sys/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a8cf415a9df..46f9faf3ade 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.139 2007/04/12 22:14:15 tedu Exp $ */ +/* $OpenBSD: init_main.c,v 1.140 2007/05/16 17:27:30 art Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -113,9 +113,6 @@ struct pcred cred0; struct plimit limit0; struct vmspace vmspace0; struct sigacts sigacts0; -#if !defined(__HAVE_CPUINFO) && !defined(curproc) -struct proc *curproc; -#endif struct proc *initproc; int cmask = CMASK; @@ -125,9 +122,6 @@ void (*md_diskconf)(void) = NULL; struct vnode *rootvp, *swapdev_vp; int boothowto; struct timeval boottime; -#ifndef __HAVE_CPUINFO -struct timeval runtime; -#endif int ncpus = 1; __volatile int start_init_exec; /* semaphore for start_init() */ @@ -199,9 +193,7 @@ main(void *framep) * any possible traps/probes to simplify trap processing. */ curproc = p = &proc0; -#ifdef __HAVE_CPUINFO p->p_cpu = curcpu(); -#endif /* * Initialize timeouts. @@ -484,14 +476,9 @@ main(void *framep) #else boottime = mono_time = time; #endif -#ifndef __HAVE_CPUINFO - microuptime(&runtime); -#endif LIST_FOREACH(p, &allproc, p_list) { p->p_stats->p_start = boottime; -#ifdef __HAVE_CPUINFO microuptime(&p->p_cpu->ci_schedstate.spc_runtime); -#endif p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0; } |