From 8f17d1fae9a1616ab948ef9c678cc693ca2844b9 Mon Sep 17 00:00:00 2001 From: fsmp Date: Wed, 23 Jul 1997 20:42:16 +0000 Subject: [PATCH] Forced 32bit alignment of struct simple_lock in param.h. Added declarations of new simple_lock data and functions to smp.h. --- sys/amd64/include/smp.h | 5 +++-- sys/i386/include/param.h | 4 ++-- sys/i386/include/smp.h | 5 +++-- sys/sys/smp.h | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index 31d8ce8e49b..21bc7c041f5 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -6,7 +6,7 @@ * 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 Xintr8254; extern u_int mask8254; +extern struct simple_lock imen_lock; /* functions in apic_ipl.s */ void vec8254 __P((void)); @@ -73,8 +74,8 @@ void INTRDIS __P((u_int)); void apic_eoi __P((void)); u_int io_apic_read __P((int, 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 void s_lock_init __P((struct simplelock *)); void s_lock __P((__volatile struct simplelock *)); diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 14f79a11a8d..c2f404535e4 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * 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_ @@ -140,7 +140,7 @@ * of these locks while a process is sleeping. */ struct simplelock { - int lock_data; + int lock_data __attribute__ ((aligned (4))); }; #if !defined(SIMPLELOCK_DEBUG) && NCPUS > 1 diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index 31d8ce8e49b..21bc7c041f5 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -6,7 +6,7 @@ * 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 Xintr8254; extern u_int mask8254; +extern struct simple_lock imen_lock; /* functions in apic_ipl.s */ void vec8254 __P((void)); @@ -73,8 +74,8 @@ void INTRDIS __P((u_int)); void apic_eoi __P((void)); u_int io_apic_read __P((int, 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 void s_lock_init __P((struct simplelock *)); void s_lock __P((__volatile struct simplelock *)); diff --git a/sys/sys/smp.h b/sys/sys/smp.h index 31d8ce8e49b..21bc7c041f5 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -6,7 +6,7 @@ * 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 Xintr8254; extern u_int mask8254; +extern struct simple_lock imen_lock; /* functions in apic_ipl.s */ void vec8254 __P((void)); @@ -73,8 +74,8 @@ void INTRDIS __P((u_int)); void apic_eoi __P((void)); u_int io_apic_read __P((int, 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 void s_lock_init __P((struct simplelock *)); void s_lock __P((__volatile struct simplelock *)); -- 2.45.2