From c87f63b6c1addc04d8849b17854645ffbee9c45b Mon Sep 17 00:00:00 2001
From: Steve Passe <fsmp@FreeBSD.org>
Date: Thu, 24 Jul 1997 18:01:34 +0000
Subject: [PATCH] Back out align attribute that corrupts "machine independance"
 of file.

Submitted by:	Bruce Evans <bde@zeta.org.au>
---
 sys/sys/lock.h    | 5 ++---
 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 6c93ef8a4ab..bbf3d448bf3 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 6c93ef8a4ab..bbf3d448bf3 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 */