diff options
| author | sobomax <sobomax@FreeBSD.org> | 2006-05-19 18:53:50 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2006-05-19 18:53:50 +0000 |
| commit | 210b6777a4180d2ef545f6c84b48b2a18fd0359b (patch) | |
| tree | 733414dbd2a9f3b280a2830de3fc91a44ad43416 /sys/i386 | |
| parent | e748a32ffa7ff410e03fce5556051d3790e73fad (diff) | |
| download | FreeBSD-src-210b6777a4180d2ef545f6c84b48b2a18fd0359b.zip FreeBSD-src-210b6777a4180d2ef545f6c84b48b2a18fd0359b.tar.gz | |
Move clock_lock prototype into <machine/clock.h>, where it is more
appropriate.
Discussed with: jhb
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/clock.h | 1 | ||||
| -rw-r--r-- | sys/i386/include/mutex.h | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index bb6f5e5..9550fab 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -25,6 +25,7 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; extern int wall_cmos_clock; +extern struct mtx clock_lock; /* * Driver to clock driver interface. diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h index 87d47e5..651e226 100644 --- a/sys/i386/include/mutex.h +++ b/sys/i386/include/mutex.h @@ -32,16 +32,7 @@ #ifndef _MACHINE_MUTEX_H_ #define _MACHINE_MUTEX_H_ -#ifndef LOCORE - -#ifdef _KERNEL - -/* Global locks */ -extern struct mtx clock_lock; - -#endif /* _KERNEL */ - -#else /* !LOCORE */ +#ifdef LOCORE /* * Simple assembly macros to get and release mutexes. @@ -71,5 +62,5 @@ extern struct mtx clock_lock; call _mtx_unlock_spin_flags ; \ addl $0x10, %esp ; \ -#endif /* !LOCORE */ +#endif /* LOCORE */ #endif /* __MACHINE_MUTEX_H */ |
