Changeset 6a44ee4 in mainline for kernel/arch/ia64/include/bootinfo.h

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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

@@ -34 +34 @@
 #define MEMMAP_ITEMS 128
 
-#define EFI_MEMMAP_FREE_MEM 0
+#define MEMMAP_FREE_MEM 0
 
 /** Size of buffer for storing task name in binit_task_t. */
@@ -54 +54 @@
         unsigned long base;
         unsigned long size;
-} efi_memmap_item_t;
+} memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
         
-        efi_memmap_item_t memmap[MEMMAP_ITEMS];
+        memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
         
@@ -66 +66 @@
         unsigned long freq_scale;
         unsigned int wakeup_intno;
-        int hello_configured;
 } bootinfo_t;