Changeset 30c4005 in mainline for kernel/arch/mips32

Timestamp:

2011-04-29T19:56:07Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2874547

Parents:

6b40ea7 (diff), afdcc60e (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 improvements

Location:

kernel/arch/mips32

Files:

• include/types.h (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)

kernel/arch/mips32/include/types.h

@@ -37 +37 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

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