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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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:

Merge mainline changes

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (6 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);
@@ -649 +645 @@
 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);
@@ -686 +678 @@
 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);
@@ -723 +711 @@
 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);
@@ -760 +744 @@
 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;
         
         /*
@@ -792 +772 @@
 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);