diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-07-28 10:50:56 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2006-07-28 13:05:16 -0600 |
| commit | a4a67f32a0b6eca09c68cdd5a4cb6e0e0fbc6690 (patch) | |
| tree | 827b0ebf3a1512854f8e56f947edcf1b4fd16321 | |
| parent | 2f2aa1af0325ee974ef2526cef1a2546a9923281 (diff) | |
kexec-tools: x86_64 backup region naming convention fix
o change BACKUP_START and BACKUP_END to BACKUP_SRC_START and BACKUP_SRC_END
to give more pertinent names and to be consistent with i386.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
| -rw-r--r-- | kexec/arch/x86_64/crashdump-x86_64.c | 6 | ||||
| -rw-r--r-- | kexec/arch/x86_64/crashdump-x86_64.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kexec/arch/x86_64/crashdump-x86_64.c b/kexec/arch/x86_64/crashdump-x86_64.c index 1465150..ff1930a 100644 --- a/kexec/arch/x86_64/crashdump-x86_64.c +++ b/kexec/arch/x86_64/crashdump-x86_64.c @@ -548,7 +548,7 @@ static int prepare_crash_memory_elf64_headers(struct kexec_info *info, bufp += sizeof(Elf64_Phdr); phdr->p_type = PT_LOAD; phdr->p_flags = PF_R|PF_W|PF_X; - if (mstart == BACKUP_START && mend == BACKUP_END) + if (mstart == BACKUP_SRC_START && mend == BACKUP_SRC_END) phdr->p_offset = info->backup_start; else phdr->p_offset = mstart; @@ -703,12 +703,12 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline, sz = (sizeof(struct memory_range) * (KEXEC_MAX_SEGMENTS + 1)); memmap_p = xmalloc(sz); memset(memmap_p, 0, sz); - add_memmap(memmap_p, BACKUP_START, BACKUP_SIZE); + add_memmap(memmap_p, BACKUP_SRC_START, BACKUP_SRC_SIZE); sz = crash_reserved_mem.end - crash_reserved_mem.start +1; add_memmap(memmap_p, crash_reserved_mem.start, sz); /* Create a backup region segment to store backup data*/ - sz = (BACKUP_SIZE + align - 1) & ~(align - 1); + sz = (BACKUP_SRC_SIZE + align - 1) & ~(align - 1); tmp = xmalloc(sz); memset(tmp, 0, sz); info->backup_start = add_buffer(info, tmp, sz, sz, align, diff --git a/kexec/arch/x86_64/crashdump-x86_64.h b/kexec/arch/x86_64/crashdump-x86_64.h index 2eb55db..9f4dee9 100644 --- a/kexec/arch/x86_64/crashdump-x86_64.h +++ b/kexec/arch/x86_64/crashdump-x86_64.h @@ -17,8 +17,8 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline, #define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 2) /* Backup Region, First 640K of System RAM. */ -#define BACKUP_START 0x00000000 -#define BACKUP_END 0x0009ffff -#define BACKUP_SIZE (BACKUP_END - BACKUP_START + 1) +#define BACKUP_SRC_START 0x00000000 +#define BACKUP_SRC_END 0x0009ffff +#define BACKUP_SRC_SIZE (BACKUP_SRC_END - BACKUP_SRC_START + 1) #endif /* CRASHDUMP_X86_64_H */ |