From 210b6777a4180d2ef545f6c84b48b2a18fd0359b Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 19 May 2006 18:53:50 +0000 Subject: Move clock_lock prototype into , where it is more appropriate. Discussed with: jhb --- sys/amd64/include/clock.h | 1 + sys/amd64/include/mutex.h | 9 --------- sys/i386/include/clock.h | 1 + sys/i386/include/mutex.h | 13 ++----------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index a8a100f..f091b17 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/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/amd64/include/mutex.h b/sys/amd64/include/mutex.h index 919a441..a2edadd 100644 --- a/sys/amd64/include/mutex.h +++ b/sys/amd64/include/mutex.h @@ -32,13 +32,4 @@ #ifndef _MACHINE_MUTEX_H_ #define _MACHINE_MUTEX_H_ -#ifndef LOCORE -#ifdef _KERNEL - -/* Global locks */ -extern struct mtx clock_lock; - -#endif /* _KERNEL */ - -#endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ 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 */ -- cgit v1.1