Changeset b7068da in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/sparc64/src/mm/sun4v/tlb.c (modified) (9 diffs)

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -218 +218 @@
         pte_t *t;
 
-        page_table_lock(AS, true);
         t = page_mapping_find(AS, va, true);
 
@@ -231 +230 @@
                 itsb_pte_copy(t);
 #endif
-                page_table_unlock(AS, true);
         } else {
                 /*
@@ -237 +235 @@
                  * handler.
                  */
-                page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
@@ -274 +271 @@
         }
 
-        page_table_lock(AS, true);
         t = page_mapping_find(AS, va, true);
         if (t) {
@@ -286 +282 @@
                 dtsb_pte_copy(t, true);
 #endif
-                page_table_unlock(AS, true);
         } else {
                 /*
@@ -292 +287 @@
                  * handler.
                  */             
-                page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
@@ -316 +310 @@
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
 
-        page_table_lock(AS, true);
         t = page_mapping_find(AS, va, true);
         if (t && PTE_WRITABLE(t)) {
@@ -331 +324 @@
                 dtsb_pte_copy(t, false);
 #endif
-                page_table_unlock(AS, true);
         } else {
                 /*
@@ -337 +329 @@
                  * handler.
                  */             
-                page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                         do_fast_data_access_protection_fault(istate, page_and_ctx,