Changes in kernel/arch/ia64/src/mm/page.c [d9ee2ea:5bda2f3e] in mainline

File:

• kernel/arch/ia64/src/mm/page.c (modified) (1 diff)

kernel/arch/ia64/src/mm/page.c

@@ -71 +71 @@
 
         /*
-         * Set up kernel region registers.
-         * VRN_KERNEL has already been set in start.S.
-         * For paranoia reasons, we set it again.
+         * First set up kernel region register.
+         * This is redundant (see start.S) but we keep it here just for sure.
+         */
+        rr.word = rr_read(VRN_KERNEL);
+        rr.map.ve = 0;                  /* disable VHPT walker */
+        rr.map.ps = PAGE_WIDTH;
+        rr.map.rid = ASID2RID(ASID_KERNEL, VRN_KERNEL);
+        rr_write(VRN_KERNEL, rr.word);
+        srlz_i();
+        srlz_d();
+
+        /*
+         * And setup the rest of region register.
          */
         for(i = 0; i < REGION_REGISTERS; i++) {
+                /* skip kernel rr */
+                if (i == VRN_KERNEL)
+                        continue;
+        
                 rr.word = rr_read(i);
                 rr.map.ve = 0;          /* disable VHPT walker */
-                rr.map.rid = ASID2RID(ASID_KERNEL, i);
+                rr.map.rid = RID_KERNEL;
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);