diff options
| author | HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> | 2013-03-04 13:18:29 +0900 |
|---|---|---|
| committer | Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp> | 2013-03-13 10:12:25 +0900 |
| commit | 279e5c0f776ad7ac58d8cd920ee23144f8fc12f1 (patch) | |
| tree | d878d483e8571cb2ab1faf748720ee1d28d29e45 | |
| parent | 5af332ef16c4075eb64efd3ace8f005bb6ae226c (diff) | |
[PATCH 1/3] elf, sadump: move KEXEC macros from sadump_info.c to elf_info.h.
Move KEXEC_CORE_NOTE_NAME and KEXEC_CORE_NOTE_NAME_BYTES in elf_info.h
to export them in elf_info.c. Later patch refers to them when reading
PT_NOTE program header entries.
During this change, round-up operations are dropped to make it uniform
to other macros such as VMCOREINFO_NOTE_NAME that is similarly
exported from elf_info.h.
Instead, the roundup-operations dropped are moved into
KEXEC_NOTE_BYTES.
Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
| -rw-r--r-- | elf_info.h | 3 | ||||
| -rw-r--r-- | sadump_info.c | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -19,6 +19,9 @@ #include <elf.h> #include <sys/types.h> +#define KEXEC_CORE_NOTE_NAME "CORE" +#define KEXEC_CORE_NOTE_NAME_BYTES sizeof(KEXEC_CORE_NOTE_NAME) + #define ERASEINFO_NOTE_NAME "ERASEINFO" #define ERASEINFO_NOTE_NAME_BYTES (sizeof(ERASEINFO_NOTE_NAME)) diff --git a/sadump_info.c b/sadump_info.c index 9346bf1..be6cf55 100644 --- a/sadump_info.c +++ b/sadump_info.c @@ -37,12 +37,10 @@ #endif -#define KEXEC_CORE_NOTE_NAME "CORE" -#define KEXEC_CORE_NOTE_NAME_BYTES roundup(sizeof(KEXEC_CORE_NOTE_NAME), 4) #define KEXEC_CORE_NOTE_DESC_BYTES roundup(sizeof(struct elf_prstatus), 4) #define KEXEC_NOTE_BYTES ((KEXEC_NOTE_HEAD_BYTES * 2) + \ - KEXEC_CORE_NOTE_NAME_BYTES + \ + roundup(KEXEC_CORE_NOTE_NAME_BYTES, 4) + \ KEXEC_CORE_NOTE_DESC_BYTES ) #define for_each_online_cpu(cpu) \ |