Changes in kernel/arch/ia64/src/mm/tlb.c [0ff03f3:7e752b2] in mainline

File:

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

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

@@ -475 +475 @@
 void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa; /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         if (t) {
                 /*
@@ -599 +603 @@
         
         page_table_lock(AS, true);
-        pte_t *entry = page_mapping_find(AS, va, true);
+        pte_t *entry = page_mapping_find(AS, va);
         if (entry) {
                 /*
@@ -645 +649 @@
 void data_dirty_bit_fault(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         ASSERT((t) && (t->p));
         if ((t) && (t->p) && (t->w)) {
@@ -678 +686 @@
 void instruction_access_bit_fault(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         ASSERT((t) && (t->p));
         if ((t) && (t->p) && (t->x)) {
@@ -711 +723 @@
 void data_access_bit_fault(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         ASSERT((t) && (t->p));
         if ((t) && (t->p)) {
@@ -744 +760 @@
 void data_access_rights_fault(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         /*
@@ -753 +773 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         ASSERT((t) && (t->p));
         ASSERT(!t->w);
@@ -772 +792 @@
 void page_not_present(uint64_t vector, istate_t *istate)
 {
+        region_register_t rr;
+        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
+        rr.word = rr_read(VA2VRN(va));
+        rid = rr.map.rid;
         
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, va, true);
+        t = page_mapping_find(AS, va);
         ASSERT(t);