Changeset 25a76ab8 in mainline for kernel/arch/ppc32/include/boot/boot.h

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/arch/ppc32/include/boot/boot.h (modified) (2 diffs)

kernel/arch/ppc32/include/boot/boot.h

@@ -52 +52 @@
 
 typedef struct {
-        uintptr_t addr;
-        uint32_t size;
+        void *addr;
+        size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
 
 typedef struct {
-        uint32_t count;
+        size_t cnt;
         utask_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
-        uintptr_t start;
-        uint32_t size;
+        void *start;
+        size_t size;
 } memzone_t;
 
 typedef struct {
-        uint32_t total;
-        uint32_t count;
+        uint64_t total;
+        size_t cnt;
         memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
@@ -80 +80 @@
 } bootinfo_t;
 
-extern bootinfo_t bootinfo;
+extern memmap_t memmap;
 
 #endif