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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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

@@ -251 +251 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
+        as_t *as = AS;
 
         if (ctx == ASID_KERNEL) {
@@ -256 +257 @@
                         /* NULL access in kernel */
                         panic("NULL pointer dereference.");
+                } else if (va >= end_of_identity) {
+                        /* Kernel non-identity */
+                        as = AS_KERNEL;
+                } else {
+                        panic("Unexpected kernel page fault.");
                 }
-                panic("Unexpected kernel page fault.");
-        }
-
-        t = page_mapping_find(AS, va, true);
+        }
+
+        t = page_mapping_find(as, va, true);
         if (t) {
                 /*
@@ -295 +300 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
-
-        t = page_mapping_find(AS, va, true);
+        as_t *as = AS;
+
+        if (ctx == ASID_KERNEL)
+                as = AS_KERNEL;
+
+        t = page_mapping_find(as, va, true);
         if (t && PTE_WRITABLE(t)) {
                 /*