Changeset 25a76ab8 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2010-05-08T07:53:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/generic/src/mm/frame.c (modified) (1 diff)

kernel/generic/src/mm/frame.c

@@ -1033 +1033 @@
                 spinlock_unlock(&zones.lock);
                 interrupts_restore(ipl);
+
+                if (!THREAD)
+                        panic("Cannot wait for memory to become available.");
                 
                 /*