talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out align attribute that corrupts "machine independance" of file. 

Submitted by:	Bruce Evans <bde@zeta.org.au>
This commit is contained in:
Steve Passe 1997-07-24 18:01:34 +00:00
parent 0298e80d89
commit c87f63b6c1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/sys/lock.h
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)lock.h 8.12 (Berkeley) 5/19/95 * @(#)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_ #ifndef _LOCK_H_
@ -47,8 +47,7 @@
* can be gained. The simple locks are defined in <machine/param.h>. * can be gained. The simple locks are defined in <machine/param.h>.
*/ */
struct lock { struct lock {
struct simplelock lk_interlock __attribute__ ((aligned (4))); struct simplelock lk_interlock; /* lock on remaining fields */
/* lock on remaining fields */
u_int lk_flags; /* see below */ u_int lk_flags; /* see below */
int lk_sharecount; /* # of accepted shared locks */ int lk_sharecount; /* # of accepted shared locks */
int lk_waitcount; /* # of processes sleeping for lock */ int lk_waitcount; /* # of processes sleeping for lock */

5
sys/sys/lockmgr.h
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)lock.h 8.12 (Berkeley) 5/19/95 * @(#)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_ #ifndef _LOCK_H_
@ -47,8 +47,7 @@
* can be gained. The simple locks are defined in <machine/param.h>. * can be gained. The simple locks are defined in <machine/param.h>.
*/ */
struct lock { struct lock {
struct simplelock lk_interlock __attribute__ ((aligned (4))); struct simplelock lk_interlock; /* lock on remaining fields */
/* lock on remaining fields */
u_int lk_flags; /* see below */ u_int lk_flags; /* see below */
int lk_sharecount; /* # of accepted shared locks */ int lk_sharecount; /* # of accepted shared locks */
int lk_waitcount; /* # of processes sleeping for lock */ int lk_waitcount; /* # of processes sleeping for lock */