Align to sizeof(long) rather than sizeof(int32_t). It needs to be

long because this code is shared with the alpha.  I hope the alpha can
read 32 bit ints at 32 bit alignment (vs. 64 bit alignment).

3 files changed, 12 insertions, 12 deletions

diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 92347e5..ecd69a2 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.11 1998/10/09 07:11:19 msmith Exp $
+ *	$Id: bootinfo.c,v 1.12 1998/10/09 23:24:55 peter Exp $
  */
 
 #include <stand.h>
@@ -166,7 +166,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(strlen(s) + 1, a);			\
     i386_copyin(s, a, strlen(s) + 1);		\
-    a += roundup(strlen(s) + 1, sizeof(u_int32_t));\
+    a += roundup(strlen(s) + 1, sizeof(u_long));\
 }
 
 #define MOD_NAME(a, s)	MOD_STR(MODINFO_NAME, a, s)
@@ -176,7 +176,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(sizeof(s), a);			\
     i386_copyin(&s, a, sizeof(s));		\
-    a += roundup(sizeof(s), sizeof(u_int32_t));	\
+    a += roundup(sizeof(s), sizeof(u_long));	\
 }
 
 #define MOD_ADDR(a, s)	MOD_VAR(MODINFO_ADDR, a, s)
@@ -186,7 +186,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(MODINFO_METADATA | mm->md_type, a);	\
     COPY32(mm->md_size, a);			\
     i386_copyin(mm->md_data, a, mm->md_size);	\
-    a += roundup(mm->md_size, sizeof(u_int32_t));\
+    a += roundup(mm->md_size, sizeof(u_long));\
 }
 
 #define MOD_END(a) {				\
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index 92347e5..ecd69a2 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.11 1998/10/09 07:11:19 msmith Exp $
+ *	$Id: bootinfo.c,v 1.12 1998/10/09 23:24:55 peter Exp $
  */
 
 #include <stand.h>
@@ -166,7 +166,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(strlen(s) + 1, a);			\
     i386_copyin(s, a, strlen(s) + 1);		\
-    a += roundup(strlen(s) + 1, sizeof(u_int32_t));\
+    a += roundup(strlen(s) + 1, sizeof(u_long));\
 }
 
 #define MOD_NAME(a, s)	MOD_STR(MODINFO_NAME, a, s)
@@ -176,7 +176,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(sizeof(s), a);			\
     i386_copyin(&s, a, sizeof(s));		\
-    a += roundup(sizeof(s), sizeof(u_int32_t));	\
+    a += roundup(sizeof(s), sizeof(u_long));	\
 }
 
 #define MOD_ADDR(a, s)	MOD_VAR(MODINFO_ADDR, a, s)
@@ -186,7 +186,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(MODINFO_METADATA | mm->md_type, a);	\
     COPY32(mm->md_size, a);			\
     i386_copyin(mm->md_data, a, mm->md_size);	\
-    a += roundup(mm->md_size, sizeof(u_int32_t));\
+    a += roundup(mm->md_size, sizeof(u_long));\
 }
 
 #define MOD_END(a) {				\
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 92347e5..ecd69a2 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.11 1998/10/09 07:11:19 msmith Exp $
+ *	$Id: bootinfo.c,v 1.12 1998/10/09 23:24:55 peter Exp $
  */
 
 #include <stand.h>
@@ -166,7 +166,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(strlen(s) + 1, a);			\
     i386_copyin(s, a, strlen(s) + 1);		\
-    a += roundup(strlen(s) + 1, sizeof(u_int32_t));\
+    a += roundup(strlen(s) + 1, sizeof(u_long));\
 }
 
 #define MOD_NAME(a, s)	MOD_STR(MODINFO_NAME, a, s)
@@ -176,7 +176,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(t, a);				\
     COPY32(sizeof(s), a);			\
     i386_copyin(&s, a, sizeof(s));		\
-    a += roundup(sizeof(s), sizeof(u_int32_t));	\
+    a += roundup(sizeof(s), sizeof(u_long));	\
 }
 
 #define MOD_ADDR(a, s)	MOD_VAR(MODINFO_ADDR, a, s)
@@ -186,7 +186,7 @@ bi_copyenv(vm_offset_t addr)
     COPY32(MODINFO_METADATA | mm->md_type, a);	\
     COPY32(mm->md_size, a);			\
     i386_copyin(mm->md_data, a, mm->md_size);	\
-    a += roundup(mm->md_size, sizeof(u_int32_t));\
+    a += roundup(mm->md_size, sizeof(u_long));\
 }
 
 #define MOD_END(a) {				\