diff options
| author | jhb <jhb@FreeBSD.org> | 2000-10-20 07:38:44 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-10-20 07:38:44 +0000 |
| commit | 8e37d201564c3b66318ae09adf72676e2ce6e580 (patch) | |
| tree | e966a0f536d465171117fca421f3cb0f2a2fc947 | |
| parent | 0da9c86e7fb39e1edbda99de6fbc68719a6a3e7f (diff) | |
| download | FreeBSD-src-8e37d201564c3b66318ae09adf72676e2ce6e580.zip FreeBSD-src-8e37d201564c3b66318ae09adf72676e2ce6e580.tar.gz | |
- machine/mutex.h -> sys/mutex.h
- Catch up to the MI mutex structure due to saveflags,saveipl,savepsr
becoming saveintr.
| -rw-r--r-- | sys/alpha/alpha/genassym.c | 4 | ||||
| -rw-r--r-- | sys/amd64/amd64/genassym.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/genassym.c | 4 | ||||
| -rw-r--r-- | sys/ia64/ia64/genassym.c | 2 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/genassym.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c index bd520f1..1572b59 100644 --- a/sys/alpha/alpha/genassym.c +++ b/sys/alpha/alpha/genassym.c @@ -48,6 +48,7 @@ #include <sys/errno.h> #include <sys/proc.h> #include <sys/mount.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/resource.h> #include <sys/resourcevar.h> @@ -55,7 +56,6 @@ #include <machine/frame.h> #include <machine/chipset.h> #include <machine/globaldata.h> -#include <machine/mutex.h> #include <sys/vmmeter.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -79,7 +79,7 @@ ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEIPL, offsetof(struct mtx, mtx_saveipl)); +ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); ASSYM(P_ADDR, offsetof(struct proc, p_addr)); diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 431a081..0c18404 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -49,6 +49,7 @@ #include <sys/proc.h> #include <sys/errno.h> #include <sys/mount.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/resourcevar.h> /* XXX */ @@ -76,7 +77,6 @@ #include <machine/sigframe.h> #include <machine/globaldata.h> #include <machine/vm86.h> -#include <machine/mutex.h> ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); @@ -229,6 +229,6 @@ ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEFL, offsetof(struct mtx, mtx_savefl)); +ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 431a081..0c18404 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -49,6 +49,7 @@ #include <sys/proc.h> #include <sys/errno.h> #include <sys/mount.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/resourcevar.h> /* XXX */ @@ -76,7 +77,6 @@ #include <machine/sigframe.h> #include <machine/globaldata.h> #include <machine/vm86.h> -#include <machine/mutex.h> ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); @@ -229,6 +229,6 @@ ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEFL, offsetof(struct mtx, mtx_savefl)); +ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c index f68ab7b..c81c5bb 100644 --- a/sys/ia64/ia64/genassym.c +++ b/sys/ia64/ia64/genassym.c @@ -76,7 +76,7 @@ ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEPSR, offsetof(struct mtx, mtx_savepsr)); +ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); ASSYM(P_ADDR, offsetof(struct proc, p_addr)); diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c index bd520f1..1572b59 100644 --- a/sys/powerpc/powerpc/genassym.c +++ b/sys/powerpc/powerpc/genassym.c @@ -48,6 +48,7 @@ #include <sys/errno.h> #include <sys/proc.h> #include <sys/mount.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/resource.h> #include <sys/resourcevar.h> @@ -55,7 +56,6 @@ #include <machine/frame.h> #include <machine/chipset.h> #include <machine/globaldata.h> -#include <machine/mutex.h> #include <sys/vmmeter.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -79,7 +79,7 @@ ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEIPL, offsetof(struct mtx, mtx_saveipl)); +ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); ASSYM(P_ADDR, offsetof(struct proc, p_addr)); |
