diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2010-04-06 22:27:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2010-04-06 22:27:00 +0000 |
| commit | 11a6a2cc862585e12ff84efc7336056f522a5322 (patch) | |
| tree | cf674b50ad28e4cca98c5ebc0a98c02e0807c1a0 | |
| parent | 916ca4a507e705a47aa3dba40687b0ed2087d1b3 (diff) | |
move some of proc.h's greatest hits to systm.h, speeding up compiles.
lots of build testing by deraadt, ok/feedback deraadt guenther kettenis
| -rw-r--r-- | sys/sys/proc.h | 17 | ||||
| -rw-r--r-- | sys/sys/systm.h | 19 |
2 files changed, 19 insertions, 17 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h index c5144375bb7..a473bc6e89a 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.124 2010/03/24 23:18:17 tedu Exp $ */ +/* $OpenBSD: proc.h,v 1.125 2010/04/06 22:26:59 tedu Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -429,9 +429,6 @@ void procinit(void); void resetpriority(struct proc *); void setrunnable(struct proc *); void unsleep(struct proc *); -void wakeup_n(const volatile void *, int); -void wakeup(const volatile void *); -#define wakeup_one(c) wakeup_n((c), 1) void reaper(void); void exit1(struct proc *, int, int); void exit2(struct proc *); @@ -453,18 +450,6 @@ struct sleep_state { int sls_sig; }; -void sleep_setup(struct sleep_state *, const volatile void *, int, - const char *); -void sleep_setup_timeout(struct sleep_state *, int); -void sleep_setup_signal(struct sleep_state *, int); -void sleep_finish(struct sleep_state *, int); -int sleep_finish_timeout(struct sleep_state *); -int sleep_finish_signal(struct sleep_state *); -void sleep_queue_init(void); - -int tsleep(const volatile void *, int, const char *, int); -int msleep(const volatile void *, struct mutex *, int, const char*, int); - #if defined(MULTIPROCESSOR) void proc_trampoline_mp(void); /* XXX */ #endif diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 99aba71ac56..bea53292d88 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.77 2009/11/04 19:14:09 kettenis Exp $ */ +/* $OpenBSD: systm.h,v 1.78 2010/04/06 22:26:59 tedu Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -227,6 +227,23 @@ void startprofclock(struct proc *); void stopprofclock(struct proc *); void setstatclockrate(int); +struct sleep_state; +void sleep_setup(struct sleep_state *, const volatile void *, int, + const char *); +void sleep_setup_timeout(struct sleep_state *, int); +void sleep_setup_signal(struct sleep_state *, int); +void sleep_finish(struct sleep_state *, int); +int sleep_finish_timeout(struct sleep_state *); +int sleep_finish_signal(struct sleep_state *); +void sleep_queue_init(void); + +struct mutex; +void wakeup_n(const volatile void *, int); +void wakeup(const volatile void *); +#define wakeup_one(c) wakeup_n((c), 1) +int tsleep(const volatile void *, int, const char *, int); +int msleep(const volatile void *, struct mutex *, int, const char*, int); + void wdog_register(void *, int (*)(void *, int)); /* |