Changeset 864a081 in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2011-05-24T03:40:00Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

bf49001

Parents:

5c460cc (diff), d4c472b (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/sparc64/src/mm/sun4v/tlb.c (modified) (3 diffs)

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -219 +219 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
 
         if (t && PTE_EXECUTABLE(t)) {
@@ -275 +275 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         if (t) {
                 /*
@@ -317 +317 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         if (t && PTE_WRITABLE(t)) {
                 /*