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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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

@@ -1142 +1142 @@
         size_t znum = find_zone(pfn, 1, 0);
 
-        
         ASSERT(znum != (size_t) -1);