Changes in kernel/arch/sparc64/src/mm/sun4v/tlb.c [b2fa1204:1dbc43f] in mainline

File:

• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (5 diffs)

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

@@ -46 +46 @@
 #include <arch.h>
 #include <print.h>
-#include <log.h>
 #include <typedefs.h>
 #include <config.h>
@@ -252 +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) {
@@ -258 +256 @@
                         /* 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.");
                 }
-        }
-
-        t = page_mapping_find(as, va, true);
+                panic("Unexpected kernel page fault.");
+        }
+
+        t = page_mapping_find(AS, va, true);
         if (t) {
                 /*
@@ -301 +295 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
-        as_t *as = AS;
-
-        if (ctx == ASID_KERNEL)
-                as = AS_KERNEL;
-
-        t = page_mapping_find(as, va, true);
+
+        t = page_mapping_find(AS, va, true);
         if (t && PTE_WRITABLE(t)) {
                 /*
@@ -336 +326 @@
 void tlb_print(void)
 {
-        log(LF_ARCH, LVL_WARN, "Operation not possible on Niagara.");
+        printf("Operation not possible on Niagara.\n");
 }