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