Changes in kernel/arch/ia64/src/mm/tlb.c [4484c16:bab75df6] in mainline

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (8 diffs)

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

@@ -464 +464 @@
 }
 
-static bool is_kernel_fault(istate_t *istate, uintptr_t va)
+static bool is_kernel_fault(uintptr_t va)
 {
         region_register_t rr;
-
-        if (istate_from_uspace(istate))
-                return false;
 
         rr.word = rr_read(VA2VRN(va));
@@ -487 +484 @@
         pte_t t;
 
-        assert(istate_from_uspace(istate));
-
         va = istate->cr_ifa; /* faulting address */
+
+        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -590 +587 @@
         as_t *as = AS;
 
-        if (is_kernel_fault(istate, va)) {
+        if (is_kernel_fault(va)) {
                 if (va < end_of_identity) {
                         /*
@@ -651 +648 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(istate, va))
+        if (is_kernel_fault(va))
                 as = AS_KERNEL;
 
@@ -683 +680 @@
         pte_t t;
 
-        assert(istate_from_uspace(istate));
-
         va = istate->cr_ifa;  /* faulting address */
+
+        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -719 +716 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(istate, va))
+        if (is_kernel_fault(va))
                 as = AS_KERNEL;
 
@@ -755 +752 @@
         pte_t t;
 
-        assert(istate_from_uspace(istate));
-
         va = istate->cr_ifa;  /* faulting address */
+
+        assert(!is_kernel_fault(va));
 
         /*
@@ -782 +779 @@
         pte_t t;
 
-        assert(istate_from_uspace(istate));
-
         va = istate->cr_ifa;  /* faulting address */
+
+        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);