git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
real2.S
diff --git
a/arch/parisc/kernel/real2.S
b/arch/parisc/kernel/real2.S
index
3637b0a
..
8dd5def
100644
(file)
--- a/
arch/parisc/kernel/real2.S
+++ b/
arch/parisc/kernel/real2.S
@@
-81,8
+81,7
@@
real32_call_asm:
rsm PSW_SM_W, %r0 /* go narrow */
#endif
rsm PSW_SM_W, %r0 /* go narrow */
#endif
- ldil L%PA(ric_ret), %r2
- ldo R%PA(ric_ret)(%r2), %r2
+ load32 PA(ric_ret), %r2
bv 0(%r31)
nop
ric_ret:
bv 0(%r31)
nop
ric_ret:
@@
-149,7
+148,7
@@
restore_control_regs:
rfi_virt2real:
/* switch to real mode... */
ssm 0,0 /* See "relied upon translation" */
rfi_virt2real:
/* switch to real mode... */
ssm 0,0 /* See "relied upon translation" */
- nop /*
comment in interruption.S
*/
+ nop /*
PA 2.0 Arch. F-5
*/
nop
nop
nop
nop
nop
nop
@@
-186,7
+185,7
@@
rfi_v2r_1:
.align 128
rfi_real2virt:
ssm 0,0 /* See "relied upon translation" */
.align 128
rfi_real2virt:
ssm 0,0 /* See "relied upon translation" */
- nop /*
comment in interruption.S
*/
+ nop /*
PA 2.0 Arch. F-5
*/
nop
nop
nop
nop
nop
nop