d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forced 32bit alignment of struct simple_lock in param.h.

Browse Source 
Added declarations of new simple_lock data and functions to smp.h.
This commit is contained in:
Steve Passe 1997-07-23 20:42:16 +00:00
parent 740dc1b5f5
commit d9593fb979
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/amd64/include/smp.h
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: smp.h,v 1.14 1997/07/23 05:41:55 smp Exp smp $ * $Id: smp.h,v 1.15 1997/07/23 20:16:11 smp Exp smp $
* *
*/ */
@ -65,6 +65,7 @@ extern volatile u_int started_cpus;
extern u_int vec[]; extern u_int vec[];
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
extern struct simple_lock imen_lock;
/* functions in apic_ipl.s */ /* functions in apic_ipl.s */
void vec8254 __P((void)); void vec8254 __P((void));
@ -73,8 +74,8 @@ void INTRDIS __P((u_int));
void apic_eoi __P((void)); void apic_eoi __P((void));
u_int io_apic_read __P((int, int)); u_int io_apic_read __P((int, int));
void io_apic_write __P((int, int, u_int)); void io_apic_write __P((int, int, u_int));
void write_io_apic_mask24 __P((int, u_int));
/* also in apic_ipl.s, experimental versions of simple_lock(), etc. */
#include <machine/param.h> #include <machine/param.h>
void s_lock_init __P((struct simplelock *)); void s_lock_init __P((struct simplelock *));
void s_lock __P((__volatile struct simplelock *)); void s_lock __P((__volatile struct simplelock *));

4
sys/i386/include/param.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)param.h 5.8 (Berkeley) 6/28/91 * from: @(#)param.h 5.8 (Berkeley) 6/28/91
* $Id: param.h,v 1.27 1997/04/07 09:27:21 peter Exp $ * $Id: param.h,v 1.3 1997/07/23 18:35:57 smp Exp smp $
*/ */
#ifndef _MACHINE_PARAM_H_ #ifndef _MACHINE_PARAM_H_
@ -140,7 +140,7 @@
* of these locks while a process is sleeping. * of these locks while a process is sleeping.
*/ */
struct simplelock { struct simplelock {
int lock_data; int lock_data __attribute__ ((aligned (4)));
}; };
#if !defined(SIMPLELOCK_DEBUG) && NCPUS > 1 #if !defined(SIMPLELOCK_DEBUG) && NCPUS > 1

5
sys/i386/include/smp.h
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: smp.h,v 1.14 1997/07/23 05:41:55 smp Exp smp $ * $Id: smp.h,v 1.15 1997/07/23 20:16:11 smp Exp smp $
* *
*/ */
@ -65,6 +65,7 @@ extern volatile u_int started_cpus;
extern u_int vec[]; extern u_int vec[];
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
extern struct simple_lock imen_lock;
/* functions in apic_ipl.s */ /* functions in apic_ipl.s */
void vec8254 __P((void)); void vec8254 __P((void));
@ -73,8 +74,8 @@ void INTRDIS __P((u_int));
void apic_eoi __P((void)); void apic_eoi __P((void));
u_int io_apic_read __P((int, int)); u_int io_apic_read __P((int, int));
void io_apic_write __P((int, int, u_int)); void io_apic_write __P((int, int, u_int));
void write_io_apic_mask24 __P((int, u_int));
/* also in apic_ipl.s, experimental versions of simple_lock(), etc. */
#include <machine/param.h> #include <machine/param.h>
void s_lock_init __P((struct simplelock *)); void s_lock_init __P((struct simplelock *));
void s_lock __P((__volatile struct simplelock *)); void s_lock __P((__volatile struct simplelock *));

5
sys/sys/smp.h
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: smp.h,v 1.14 1997/07/23 05:41:55 smp Exp smp $ * $Id: smp.h,v 1.15 1997/07/23 20:16:11 smp Exp smp $
* *
*/ */
@ -65,6 +65,7 @@ extern volatile u_int started_cpus;
extern u_int vec[]; extern u_int vec[];
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
extern struct simple_lock imen_lock;
/* functions in apic_ipl.s */ /* functions in apic_ipl.s */
void vec8254 __P((void)); void vec8254 __P((void));
@ -73,8 +74,8 @@ void INTRDIS __P((u_int));
void apic_eoi __P((void)); void apic_eoi __P((void));
u_int io_apic_read __P((int, int)); u_int io_apic_read __P((int, int));
void io_apic_write __P((int, int, u_int)); void io_apic_write __P((int, int, u_int));
void write_io_apic_mask24 __P((int, u_int));
/* also in apic_ipl.s, experimental versions of simple_lock(), etc. */
#include <machine/param.h> #include <machine/param.h>
void s_lock_init __P((struct simplelock *)); void s_lock_init __P((struct simplelock *));
void s_lock __P((__volatile struct simplelock *)); void s_lock __P((__volatile struct simplelock *));