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

Timestamp:

2012-07-14T11:18:40Z (12 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/frame.c (modified) (4 diffs)

kernel/generic/src/mm/frame.c

@@ -1086 +1086 @@
 #endif
                 
+                /*
+                 * Since the mem_avail_mtx is an active mutex, we need to disable interrupts
+                 * to prevent deadlock with TLB shootdown.
+                 */
+                ipl_t ipl = interrupts_disable();
                 mutex_lock(&mem_avail_mtx);
                 
@@ -1098 +1103 @@
                 
                 mutex_unlock(&mem_avail_mtx);
+                interrupts_restore(ipl);
                 
 #ifdef CONFIG_DEBUG
@@ -1161 +1167 @@
          * Signal that some memory has been freed.
          */
+
+        
+        /*
+         * Since the mem_avail_mtx is an active mutex, we need to disable interrupts
+         * to prevent deadlock with TLB shootdown.
+         */
+        ipl_t ipl = interrupts_disable();
         mutex_lock(&mem_avail_mtx);
         if (mem_avail_req > 0)
@@ -1170 +1183 @@
         }
         mutex_unlock(&mem_avail_mtx);
+        interrupts_restore(ipl);
         
         if (!(flags & FRAME_NO_RESERVE))