diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-07-24 18:01:34 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-07-24 18:01:34 +0000 |
| commit | f3f46f09969d99dfb46b6137951fdfe64c541ddf (patch) | |
| tree | 73b42e2d0af8d8ee56f6ab3f0700f4ee341790b5 | |
| parent | 4479faef611b01733531d79354ba8aac67897c64 (diff) | |
| download | FreeBSD-src-f3f46f09969d99dfb46b6137951fdfe64c541ddf.zip FreeBSD-src-f3f46f09969d99dfb46b6137951fdfe64c541ddf.tar.gz | |
Back out align attribute that corrupts "machine independance" of file.
Submitted by: Bruce Evans <bde@zeta.org.au>
| -rw-r--r-- | sys/sys/lock.h | 5 | ||||
| -rw-r--r-- | sys/sys/lockmgr.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 6c93ef8..bbf3d44 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $Id: lock.h,v 1.2 1997/07/23 18:34:21 smp Exp smp $ + * $Id: lock.h,v 1.5 1997/07/23 20:40:52 fsmp Exp $ */ #ifndef _LOCK_H_ @@ -47,8 +47,7 @@ * can be gained. The simple locks are defined in <machine/param.h>. */ struct lock { - struct simplelock lk_interlock __attribute__ ((aligned (4))); - /* lock on remaining fields */ + struct simplelock lk_interlock; /* lock on remaining fields */ u_int lk_flags; /* see below */ int lk_sharecount; /* # of accepted shared locks */ int lk_waitcount; /* # of processes sleeping for lock */ diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h index 6c93ef8..bbf3d44 100644 --- a/sys/sys/lockmgr.h +++ b/sys/sys/lockmgr.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $Id: lock.h,v 1.2 1997/07/23 18:34:21 smp Exp smp $ + * $Id: lock.h,v 1.5 1997/07/23 20:40:52 fsmp Exp $ */ #ifndef _LOCK_H_ @@ -47,8 +47,7 @@ * can be gained. The simple locks are defined in <machine/param.h>. */ struct lock { - struct simplelock lk_interlock __attribute__ ((aligned (4))); - /* lock on remaining fields */ + struct simplelock lk_interlock; /* lock on remaining fields */ u_int lk_flags; /* see below */ int lk_sharecount; /* # of accepted shared locks */ int lk_waitcount; /* # of processes sleeping for lock */ |
