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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

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(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));
@@ -484 +487 @@
         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);
@@ -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;
 
@@ -680 +683 @@
         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);
@@ -716 +719 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(va))
+        if (is_kernel_fault(istate, va))
                 as = AS_KERNEL;
 
@@ -752 +755 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         /*
@@ -779 +782 @@
         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);