---

yaml --- r: 5855 b: refs/heads/master c: 4aec0fb h: refs/heads/master i: 5853: bfc2f74 5851: 4ae6b88 5847: 8492711 5839: bb597f8 5823: e134f1e v: v3
git-mirror · Aug 18, 2005 · 2dfe88a · 2dfe88a
1 parent 9e234f8
commit 2dfe88a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);