diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-23 10:39:15 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-23 10:39:15 -0400 |
| commit | 62d75f3753647656323b0365faa43fc1a8f7be97 (patch) | |
| tree | 0572889bd8f83cf17622790e8533dd7c2ebadc7e | |
| parent | 034e5356a4c0401d1227393de4c756e9c414be35 (diff) | |
[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>
| -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 { | |||
| 30 | unsigned len; | 30 | unsigned len; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | /* SSC_WAIT_COMPLETION appears to want this large alignment. gcc < 4 | ||
| 34 | * seems to give it by default, however gcc > 4 is smarter and may | ||
| 35 | * not. | ||
| 36 | */ | ||
| 37 | struct disk_stat { | 33 | struct disk_stat { |
| 38 | int fd; | 34 | int fd; |
| 39 | unsigned count; | 35 | unsigned count; |
| 40 | } __attribute__ ((aligned (16))); | 36 | }; |
| 41 | 37 | ||
| 42 | extern void jmp_to_kernel (unsigned long bp, unsigned long e_entry); | 38 | extern void jmp_to_kernel (unsigned long bp, unsigned long e_entry); |
| 43 | extern struct ia64_boot_param *sys_fw_init (const char *args, int arglen); | 39 | extern struct ia64_boot_param *sys_fw_init (const char *args, int arglen); |
