summaryrefslogtreecommitdiff
path: root/sys/kern/kern_synch.c
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2007-05-16 17:27:32 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2007-05-16 17:27:32 +0000
commita5055ebb8629500104a3b1d3dc614f04db4f363e (patch)
treee7ea33d78c280d57703780e4a90cb563f4d674b4 /sys/kern/kern_synch.c
parent12c89e80fa52a6fdd0b959dbe94d18e61053d63e (diff)
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/kern_synch.c')
-rw-r--r--sys/kern/kern_synch.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 5acff3ccad8..849dffefc57 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_synch.c,v 1.79 2007/04/03 08:05:43 art Exp $ */
+/* $OpenBSD: kern_synch.c,v 1.80 2007/05/16 17:27:30 art Exp $ */
/* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */
/*
@@ -185,11 +185,7 @@ sleep_finish(struct sleep_state *sls, int do_sleep)
#endif
}
-#ifdef __HAVE_CPUINFO
p->p_cpu->ci_schedstate.spc_curpriority = p->p_usrpri;
-#else
- curpriority = p->p_usrpri;
-#endif
SCHED_UNLOCK(sls->sls_s);
/*
@@ -357,12 +353,8 @@ restart:
* resched_proc().
*/
setrunqueue(p);
-#ifdef __HAVE_CPUINFO
KASSERT(p->p_cpu != NULL);
need_resched(p->p_cpu);
-#else
- need_resched(NULL);
-#endif
/* END INLINE EXPANSION */
if (n != 0)