Changeset 402eda5 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2010-06-22T12:19:45Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9539be6

Parents:

a49a1a1

Message:

Fix a newly introduced deadlock in the TLB shootdown algorithm.

File:

• kernel/generic/src/mm/as.c (modified) (6 diffs)

kernel/generic/src/mm/as.c

@@ -433 +433 @@
                  *
                  */
-                tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base +
-                    pages * PAGE_SIZE, area->pages - pages);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid,
+                    area->base + pages * PAGE_SIZE, area->pages - pages);
                 
                 /*
@@ -528 +528 @@
                 as_invalidate_translation_cache(as, area->base +
                     pages * PAGE_SIZE, area->pages - pages);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
                 
                 page_table_unlock(as, false);
@@ -578 +578 @@
          * Start TLB shootdown sequence.
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
+        ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base,
+            area->pages);
         
         /*
@@ -625 +626 @@
          */
         as_invalidate_translation_cache(as, area->base, area->pages);
-        tlb_shootdown_finalize();
+        tlb_shootdown_finalize(ipl);
         
         page_table_unlock(as, false);
@@ -865 +866 @@
          *
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
+        ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base,
+            area->pages);
         
         /*
@@ -912 +914 @@
          */
         as_invalidate_translation_cache(as, area->base, area->pages);
-        tlb_shootdown_finalize();
+        tlb_shootdown_finalize(ipl);
         
         page_table_unlock(as, false);