Changeset 25a76ab8 in mainline for kernel/arch/ia64/include/bootinfo.h

Timestamp:

2010-05-08T07:53:23Z (14 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/ia64/include/bootinfo.h (modified) (3 diffs)

kernel/arch/ia64/include/bootinfo.h

@@ -32 +32 @@
 #define BOOTINFO_ADDRESS 0x4401000
 
-#define CONFIG_INIT_TASKS       32
+#define TASKMAP_MAX_RECORDS  32
 
 #define MEMMAP_ITEMS 128
@@ -44 +44 @@
 
 typedef struct {
-        void *addr; 
-        unsigned long size;
+        void *addr;
+        size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } binit_task_t;
         
 typedef struct {
-        unsigned long count;
-        binit_task_t tasks[CONFIG_INIT_TASKS];
+        size_t cnt;
+        binit_task_t tasks[TASKMAP_MAX_RECORDS];
 } binit_t;
 
@@ -58 +58 @@
         unsigned long base;
         unsigned long size;
-}efi_memmap_item_t;
-
+} efi_memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
-
+        
         efi_memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
-
+        
         unative_t *sapic;
         unsigned long sys_freq;