diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-12 10:58:35 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-12 10:58:35 +0000 |
| commit | 559c76ec11b66786572501f6ab7b5d843c8fa500 (patch) | |
| tree | 89385ae89ccb99165fd0d65ca09ad5c3b95d686a /include | |
| parent | 9359b61ca44980d33c0bee42b9bb2e36e72835dd (diff) | |
| parent | f4d1d2ad474e882df13418239aa3050673a844d7 (diff) | |
| download | kexec-tools-baserock/morph.tar.gz | |
Merge branch 'baserock/tiagogomes/armv8l64' into baserock/morphbaserock/morph
Diffstat (limited to 'include')
| -rw-r--r-- | include/elf.h | 4 | ||||
| -rw-r--r-- | include/x86/x86-linux.h | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/elf.h b/include/elf.h index 1a2eb5a..5db637b 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1984,6 +1984,10 @@ typedef Elf32_Addr Elf32_Conflict; #define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */ #define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */ #define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ +#define R_PPC64_REL16 249 /* half16 (sym+add-.) */ +#define R_PPC64_REL16_LO 250 /* half16 (sym+add-.)@l */ +#define R_PPC64_REL16_HI 251 /* half16 (sym+add-.)@h */ +#define R_PPC64_REL16_HA 252 /* half16 (sym+add-.)@ha */ /* Keep this the last entry. */ #define R_PPC64_NUM 107 diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h index 0949dc2..50c7324 100644 --- a/include/x86/x86-linux.h +++ b/include/x86/x86-linux.h @@ -12,8 +12,6 @@ #ifndef ASSEMBLY -#define PACKED __attribute__((packed)) - #ifndef E820_RAM struct e820entry { uint64_t addr; /* start of memory segment */ @@ -23,7 +21,7 @@ struct e820entry { #define E820_RESERVED 2 #define E820_ACPI 3 /* usable as RAM once ACPI tables have been read */ #define E820_NVS 4 -} PACKED; +} __attribute__((packed)); #endif /* FIXME expand on drive_info_)struct... */ @@ -115,7 +113,8 @@ struct x86_linux_param_header { uint32_t ext_ramdisk_image; /* 0xc0 */ uint32_t ext_ramdisk_size; /* 0xc4 */ uint32_t ext_cmd_line_ptr; /* 0xc8 */ - uint8_t reserved4_1[0x1e0 - 0xcc]; /* 0xcc */ + uint8_t reserved4_1[0x1c0 - 0xcc]; /* 0xe4 */ + uint8_t efi_info[32]; /* 0x1c0 */ uint32_t alt_mem_k; /* 0x1e0 */ uint8_t reserved5[4]; /* 0x1e4 */ uint8_t e820_map_nr; /* 0x1e8 */ @@ -255,7 +254,7 @@ struct x86_linux_header { uint64_t pref_address; /* 0x258 */ uint32_t init_size; /* 0x260 */ uint32_t handover_offset; /* 0x264 */ -} PACKED; +} __attribute__((packed)); #endif /* ASSEMBLY */ |