Changeset f4f866c in mainline for kernel/arch/mips32/include/arch.h

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/include/arch.h (modified) (3 diffs)

kernel/arch/mips32/include/arch.h

@@ -36 +36 @@
 #define KERN_mips32_ARCH_H_
 
-#define TASKMAP_MAX_RECORDS  32
-#define CPUMAP_MAX_RECORDS   32
+#include <typedefs.h>
 
-#define BOOTINFO_TASK_NAME_BUFLEN 32
-
-#include <typedefs.h>
+#define TASKMAP_MAX_RECORDS        32
+#define CPUMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
 extern size_t cpu_count;
@@ -47 +46 @@
 typedef struct {
         uintptr_t addr;
-        uint32_t size;
+        size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
@@ -53 +52 @@
 typedef struct {
         uint32_t cpumap;
-        uint32_t cnt;
+        size_t cnt;
         utask_t tasks[TASKMAP_MAX_RECORDS];
 } bootinfo_t;