Changeset da3e227 in mainline

Timestamp:

2009-09-05T18:40:25Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

de48286

Parents:

b53e6d9 (diff), 8b4cfb9d (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 ia64 fixes.

Location:

kernel/arch/ia64

Files:

• include/asm.h (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)

kernel/arch/ia64/include/asm.h

@@ -422 +422 @@
         asm volatile (
                 "rsm %[mask]\n"
+                ";;\n"
+                "srlz.d\n"
                 :: [mask] "i" (PSR_PK_MASK)
         );

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

@@ -73 +73 @@
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);
+                srlz_d();
+                srlz_i();
         }
-        srlz_d();
-        srlz_i();
 }