From: Tony Luck <tony.luck@intel.com>
Date: Tue, 23 Aug 2005 14:39:15 +0000 (-0700)
Subject: [IA64] backout incorrect fix for simulator boot issue
X-Git-Tag: v2.6.13-rc7~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62d75f3753647656323b0365faa43fc1a8f7be97;p=linux-2.6-omap-h63xx.git

[IA64] backout incorrect fix for simulator boot issue

Earlier fix in 4aec0fb12267718c750475f3404337ad13caa8f5 just
masked the real problem.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/hp/sim/boot/bootloader.c b/arch/ia64/hp/sim/boot/bootloader.c
index a7bed60b69f..51a7b7b4dd0 100644
--- a/arch/ia64/hp/sim/boot/bootloader.c
+++ b/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);