Commit 5e0e25b8 authored by Keith Owens's avatar Keith Owens Committed by Tony Luck

[IA64] ar.k[56] have virtual addresses already, don't convert

r.k[56] used to contain physical addresses but now contain virtual
addresses.  There are code remnants which still believe that they are
physical and "convert" ar.k[56] to virtual.  This breaks when current
is not in region 7 (e.g. the idle task on cpu 0).
Signed-off-by: default avatarKeith Owens <kaos@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 1a627e37
...@@ -54,8 +54,7 @@ ...@@ -54,8 +54,7 @@
(pUStk) mov ar.rsc=0x3; /* set eager mode, pl 0, little-endian, loadrs=0 */ \ (pUStk) mov ar.rsc=0x3; /* set eager mode, pl 0, little-endian, loadrs=0 */ \
#define MINSTATE_END_SAVE_MIN_PHYS \ #define MINSTATE_END_SAVE_MIN_PHYS \
or r12=r12,r14; /* make sp a kernel virtual address */ \ dep r12=-1,r12,61,3; /* make sp a kernel virtual address */ \
or r13=r13,r14; /* make `current' a kernel virtual address */ \
;; ;;
#ifdef MINSTATE_VIRT #ifdef MINSTATE_VIRT
...@@ -172,7 +171,6 @@ ...@@ -172,7 +171,6 @@
;; \ ;; \
.mem.offset 0,0; st8.spill [r16]=r15,16; \ .mem.offset 0,0; st8.spill [r16]=r15,16; \
.mem.offset 8,0; st8.spill [r17]=r14,16; \ .mem.offset 8,0; st8.spill [r17]=r14,16; \
dep r14=-1,r0,61,3; \
;; \ ;; \
.mem.offset 0,0; st8.spill [r16]=r2,16; \ .mem.offset 0,0; st8.spill [r16]=r2,16; \
.mem.offset 8,0; st8.spill [r17]=r3,16; \ .mem.offset 8,0; st8.spill [r17]=r3,16; \
......
...@@ -162,9 +162,6 @@ ...@@ -162,9 +162,6 @@
;; \ ;; \
srlz.d; \ srlz.d; \
mov r13 = ar.k6; \ mov r13 = ar.k6; \
;; \
DATA_PA_TO_VA(r13,temp1); \
;; \
mov temp2 = ar.bspstore; \ mov temp2 = ar.bspstore; \
;; \ ;; \
DATA_PA_TO_VA(temp2,temp1); \ DATA_PA_TO_VA(temp2,temp1); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment