Changes in boot/arch/ia64/include/types.h [bbe4828:96b02eb9] in mainline

File:

• boot/arch/ia64/include/types.h (modified) (3 diffs)

boot/arch/ia64/include/types.h

@@ -30 +30 @@
 #define BOOT_ia64_TYPES_H_
 
-#include <arch/common.h>
-
 #define TASKMAP_MAX_RECORDS             32
 #define BOOTINFO_TASK_NAME_BUFLEN       32
-#define MEMMAP_ITEMS                    128
+#define MEMMAP_ITEMS                    128     
 
 typedef uint64_t size_t;
@@ -55 +53 @@
         unsigned long base;
         unsigned long size;
-} memmap_item_t;
+} efi_memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
 
-        memmap_item_t memmap[MEMMAP_ITEMS];
+        efi_memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
 
@@ -67 +65 @@
         unsigned long freq_scale;
         unsigned int wakeup_intno;
+        int hello_configured;
 } bootinfo_t;
 
-/** This is a minimal ELILO-compatible boot parameter structure. */
-typedef struct {
-        uint64_t cmd_line;
-        uint64_t efi_system_table;
-        uint64_t efi_memmap;
-        uint64_t efi_memmap_sz;
-        uint64_t efi_memdesc_sz;
-} boot_param_t;
-
 #endif