From 77d656f51de2b07086268dd056855e9ff251c60b Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Tue, 23 Aug 2005 07:39:15 -0700
Subject: [PATCH] --- yaml --- r: 5919 b: refs/heads/master c:
 62d75f3753647656323b0365faa43fc1a8f7be97 h: refs/heads/master i:   5917:
 e53a113c34f94566c013c8c74db2a23791483f41   5915:
 3a4fd3182f5b8c51cc2ad103fdb04a12fbb8e200   5911:
 6578bee69f1fe3db96219d2a188c22fccba6f8a0   5903:
 e87a969ce5c961bfd33be26e12d42c1b94aa8c72   5887:
 cb047e68d9a59adb5f0223cc9468b2874bb40d10 v: v3

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

diff --git a/[refs] b/[refs]
index 3228c9305cef..38ebf5ee492b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 034e5356a4c0401d1227393de4c756e9c414be35
+refs/heads/master: 62d75f3753647656323b0365faa43fc1a8f7be97
diff --git a/trunk/arch/ia64/hp/sim/boot/bootloader.c b/trunk/arch/ia64/hp/sim/boot/bootloader.c
index a7bed60b69f9..51a7b7b4dd0e 100644
--- a/trunk/arch/ia64/hp/sim/boot/bootloader.c
+++ b/trunk/arch/ia64/hp/sim/boot/bootloader.c
@@ -30,14 +30,10 @@ 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);