diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-23 16:39:15 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-23 16:39:15 +0200 |
| commit | 62d75f3753647656323b0365faa43fc1a8f7be97 (patch) | |
| tree | 0572889bd8f83cf17622790e8533dd7c2ebadc7e /arch | |
| parent | Pull prarit-bus-sysdata into release branch (diff) | |
| download | linux-62d75f3753647656323b0365faa43fc1a8f7be97.tar.xz linux-62d75f3753647656323b0365faa43fc1a8f7be97.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/hp/sim/boot/bootloader.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ia64/hp/sim/boot/bootloader.c b/arch/ia64/hp/sim/boot/bootloader.c index a7bed60b69f9..51a7b7b4dd0e 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); |