Changeset b2fa2d86 in mainline for kernel/arch/mips32/src/mm/tlb.c

Timestamp:

2013-03-26T15:06:35Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea15a89a

Parents:

8a26f82 (diff), 5c4356b (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/mips32/src/mm/tlb.c (modified) (8 diffs)

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

@@ -94 +94 @@
         entry_lo_t lo;
         uintptr_t badvaddr;
-        uintptr_t page;
         pte_t *pte;
         
         badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
-
-        pte = page_mapping_find(AS, page, true);
+
+        pte = page_mapping_find(AS, badvaddr, true);
         if (pte && pte->p) {
                 /*
@@ -125 +123 @@
         }
 
-        (void) as_page_fault(page, PF_ACCESS_READ, istate);
+        (void) as_page_fault(badvaddr, PF_ACCESS_READ, istate);
 }
 
@@ -137 +135 @@
         tlb_index_t index;
         uintptr_t badvaddr;
-        uintptr_t page;
         pte_t *pte;
 
@@ -161 +158 @@
 
         badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
-
-        pte = page_mapping_find(AS, page, true);
+
+        pte = page_mapping_find(AS, badvaddr, true);
         if (pte && pte->p) {
                 /*
@@ -189 +185 @@
         }
 
-        (void) as_page_fault(page, PF_ACCESS_READ, istate);
+        (void) as_page_fault(badvaddr, PF_ACCESS_READ, istate);
 }
 
@@ -201 +197 @@
         tlb_index_t index;
         uintptr_t badvaddr;
-        uintptr_t page;
         pte_t *pte;
 
         badvaddr = cp0_badvaddr_read();
-        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
 
         /*
@@ -227 +221 @@
         }
 
-        pte = page_mapping_find(AS, page, true);
+        pte = page_mapping_find(AS, badvaddr, true);
         if (pte && pte->p && pte->w) {
                 /*
@@ -254 +248 @@
         }
 
-        (void) as_page_fault(page, PF_ACCESS_WRITE, istate);
+        (void) as_page_fault(badvaddr, PF_ACCESS_WRITE, istate);
 }