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

Timestamp:

2019-06-15T11:58:49Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef705e14

Parents:

180e132

Message:

Consider kernel fault only if it came from kernel

File:

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

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

@@ -464 +464 @@
 }
 
-static bool is_kernel_fault(uintptr_t va)
+static bool is_kernel_fault(istate_t *istate, uintptr_t va)
 {
         region_register_t rr;
+
+        if (istate_from_uspace(istate))
+                return false;
 
         rr.word = rr_read(VA2VRN(va));
@@ -587 +590 @@
         as_t *as = AS;
 
-        if (is_kernel_fault(va)) {
+        if (is_kernel_fault(istate, va)) {
                 if (va < end_of_identity) {
                         /*
@@ -648 +651 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(va))
+        if (is_kernel_fault(istate, va))
                 as = AS_KERNEL;
 
@@ -716 +719 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(va))
+        if (is_kernel_fault(istate, va))
                 as = AS_KERNEL;