Changeset 97c7682 in mainline for kernel/generic/src/mm/tlb.c

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/generic/src/mm/tlb.c (modified) (2 diffs)

kernel/generic/src/mm/tlb.c

@@ -162 +162 @@
         
         size_t i;
-        for (i = 0; i < CPU->tlb_messages_count; CPU->tlb_messages_count--) {
+        for (i = 0; i < CPU->tlb_messages_count; i++) {
                 tlb_invalidate_type_t type = CPU->tlb_messages[i].type;
                 asid_t asid = CPU->tlb_messages[i].asid;
@@ -188 +188 @@
         }
         
+        CPU->tlb_messages_count = 0;
         irq_spinlock_unlock(&CPU->lock, false);
         CPU->tlb_active = true;