27c27
< * $FreeBSD: head/sys/dev/acpica/Osd/OsdSynch.c 99492 2002-07-06 13:59:59Z iwasaki $
---
> * $FreeBSD: head/sys/dev/acpica/Osd/OsdSynch.c 105278 2002-10-16 17:23:34Z jhb $
38d37
< #include <sys/lock.h>
40d38
< #include <sys/mutex.h>
41a40,43
> #if __FreeBSD_version >= 500000
> #include <sys/lock.h>
> #include <sys/mutex.h>
> #endif
47a50,60
> #if __FreeBSD_version < 500000
> # define AS_LOCK(as) s = splhigh()
> # define AS_UNLOCK(as) splx(s)
> # define AS_LOCK_DECL int s
> # define msleep(a, b, c, d, e) tsleep(a, c, d, e)
> #else
> # define AS_LOCK(as) mtx_lock(&(as)->as_mtx)
> # define AS_UNLOCK(as) mtx_unlock(&(as)->as_mtx)
> # define AS_LOCK_DECL
> #endif
>
52a66
> #if __FreeBSD_version >= 500000
53a68
> #endif
87a103
> #if __FreeBSD_version >= 500000
88a105
> #endif
113a131
> #if __FreeBSD_version >= 500000
114a133
> #endif
134a154
> AS_LOCK_DECL;
147c167
< mtx_lock(&as->as_mtx);
---
> AS_LOCK(as);
153c173
< mtx_unlock(&as->as_mtx);
---
> AS_UNLOCK(as);
180c200
< mtx_lock(&as->as_mtx);
---
> AS_LOCK(as);
206a227
> #if __FreeBSD_version >= 500000
209a231
> #endif
277c299
< mtx_unlock(&as->as_mtx);
---
> AS_UNLOCK(as);
289a312
> AS_LOCK_DECL;
296c319
< mtx_lock(&as->as_mtx);
---
> AS_LOCK(as);
312c335
< mtx_unlock(&as->as_mtx);
---
> AS_UNLOCK(as);