Changeset b79d450 in mainline for kernel/arch/ia64/src/mm/page.c

Timestamp:

2010-01-27T20:35:49Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -71 +71 @@
 
         /*
-         * 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.
+         * Set up kernel region registers.
+         * VRN_KERNEL has already been set in start.S.
+         * For paranoia reasons, we set it again.
          */
         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 = RID_KERNEL;
+                rr.map.rid = ASID2RID(ASID_KERNEL, i);
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);