diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
| commit | e8f9b6396e79654ea5932f64131cafbe8caadfb1 (patch) | |
| tree | 90cf8b3a2475a774369eda22247cab7874fd7bbf /arch/ia64/kernel/efi_stub.S | |
| parent | d4c419dfaa853f5db107973976d4215ae648e976 (diff) | |
Merge with Linux 2.4.0-test5-pre2.
Diffstat (limited to 'arch/ia64/kernel/efi_stub.S')
| -rw-r--r-- | arch/ia64/kernel/efi_stub.S | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/ia64/kernel/efi_stub.S b/arch/ia64/kernel/efi_stub.S index 2bb45c790..1ee6ad05f 100644 --- a/arch/ia64/kernel/efi_stub.S +++ b/arch/ia64/kernel/efi_stub.S @@ -76,17 +76,14 @@ GLOBAL_ENTRY(efi_call_phys) andcm r16=loc3,r16 // get psr with IT, DT, and RT bits cleared mov out3=in4 br.call.sptk.few rp=ia64_switch_mode -.ret0: - mov out4=in5 +.ret0: mov out4=in5 mov out5=in6 mov out6=in7 br.call.sptk.few rp=b6 // call the EFI function -.ret1: - mov ar.rsc=r0 // put RSE in enforced lazy, LE mode +.ret1: mov ar.rsc=r0 // put RSE in enforced lazy, LE mode mov r16=loc3 br.call.sptk.few rp=ia64_switch_mode // return to virtual mode -.ret2: - mov ar.rsc=loc4 // restore RSE configuration +.ret2: mov ar.rsc=loc4 // restore RSE configuration mov ar.pfs=loc1 mov rp=loc0 mov gp=loc2 |