Changeset 544a2e4 in mainline for kernel/arch/mips32/src/mm/frame.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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/arch/mips32/src/mm/frame.c (modified) (1 diff)

kernel/arch/mips32/src/mm/frame.c

@@ -88 +88 @@
         /* gxemul devices */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-            0x10000000, MB2SIZE(256)))
+            0x10000000, MiB2SIZE(256)))
                 return false;
 #endif