Changeset df3c6f02 in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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/tlb.c (modified) (7 diffs)

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

@@ -481 +481 @@
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         if (t) {
                 /*
@@ -599 +599 @@
         
         page_table_lock(AS, true);
-        pte_t *entry = page_mapping_find(AS, va);
+        pte_t *entry = page_mapping_find(AS, va, true);
         if (entry) {
                 /*
@@ -651 +651 @@
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         ASSERT((t) && (t->p));
         if ((t) && (t->p) && (t->w)) {
@@ -684 +684 @@
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         ASSERT((t) && (t->p));
         if ((t) && (t->p) && (t->x)) {
@@ -717 +717 @@
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         ASSERT((t) && (t->p));
         if ((t) && (t->p)) {
@@ -753 +753 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         ASSERT((t) && (t->p));
         ASSERT(!t->w);
@@ -778 +778 @@
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va);
+        t = page_mapping_find(AS, va, true);
         ASSERT(t);