Changeset cefb126 in mainline for kernel/genarch/src/mm/asid.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/genarch/src/mm/asid.c (modified) (2 diffs)

kernel/genarch/src/mm/asid.c

@@ -126 +126 @@
                  * Get the system rid of the stolen ASID.
                  */
-                tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
                 tlb_invalidate_asid(asid);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
         } else {
 
@@ -142 +142 @@
                  * Purge the allocated ASID from TLBs.
                  */
-                tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
                 tlb_invalidate_asid(asid);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
         }