Changeset df29f24 in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2011-06-01T09:04:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (3 diffs)

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

@@ -207 +207 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, page_16k);
+        t = page_mapping_find(AS, page_16k, true);
         if (t && PTE_EXECUTABLE(t)) {
                 /*
@@ -275 +275 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, page_16k);
+        t = page_mapping_find(AS, page_16k, true);
         if (t) {
                 /*
@@ -319 +319 @@
 
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, page_16k);
+        t = page_mapping_find(AS, page_16k, true);
         if (t && PTE_WRITABLE(t)) {
                 /*