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);