From 2dfe88ad4ab6c9204829981035cfab5ee10b0622 Mon Sep 17 00:00:00 2001
From: Ian Wienand <ianw@gelato.unsw.edu.au>
Date: Tue, 19 Jul 2005 22:32:00 -0700
Subject: [PATCH] --- yaml --- r: 5855 b: refs/heads/master c:
 4aec0fb12267718c750475f3404337ad13caa8f5 h: refs/heads/master i:   5853:
 bfc2f74c14dd0e56b08775aabc6e1abbcdfd031e   5851:
 4ae6b88138aef9a3d01887976454e2ef504885e8   5847:
 8492711c028b7cb13482f2d9ccd6b47491ea2b74   5839:
 bb597f80bd8b2b1125446cf3fb5b6c221dca3dee   5823:
 e134f1ea5d9cfe82e893f1d636ed89079b6e1302 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/ia64/hp/sim/boot/bootloader.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4fa625b088b1..b45ab3461822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e8727fbb3749075b6df36be636a3045ed9d515
+refs/heads/master: 4aec0fb12267718c750475f3404337ad13caa8f5
diff --git a/trunk/arch/ia64/hp/sim/boot/bootloader.c b/trunk/arch/ia64/hp/sim/boot/bootloader.c
index 51a7b7b4dd0e..a7bed60b69f9 100644
--- a/trunk/arch/ia64/hp/sim/boot/bootloader.c
+++ b/trunk/arch/ia64/hp/sim/boot/bootloader.c
@@ -30,10 +30,14 @@ struct disk_req {
 	unsigned len;
 };
 
+/* SSC_WAIT_COMPLETION appears to want this large alignment.  gcc < 4
+ * seems to give it by default, however gcc > 4 is smarter and may
+ * not.
+ */
 struct disk_stat {
 	int fd;
 	unsigned count;
-};
+} __attribute__ ((aligned (16)));
 
 extern void jmp_to_kernel (unsigned long bp, unsigned long e_entry);
 extern struct ia64_boot_param *sys_fw_init (const char *args, int arglen);