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 <[EMAIL PROTECTED]>
---
kexec-tools-1.101-vivek/kexec/arch/x86_64/crashdump-x86_64.c | 6 +++---
kexec-tools-1.101-vivek/kexec/arch/x86_64/crashdump-x86_64.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff -puN
kexec/arch/x86_64/crashdump-x86_64.h~kexec-tools-x86_64-backup-region-naming-consistency-fix
kexec/arch/x86_64/crashdump-x86_64.h
---
kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.h~kexec-tools-x86_64-backup-region-naming-consistency-fix
2006-07-28 09:16:42.000000000 -0700
+++ kexec-tools-1.101-vivek/kexec/arch/x86_64/crashdump-x86_64.h
2006-07-28 09:17:45.000000000 -0700
@@ -17,8 +17,8 @@ int load_crashdump_segments(struct kexec
#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 */
diff -puN
kexec/arch/x86_64/crashdump-x86_64.c~kexec-tools-x86_64-backup-region-naming-consistency-fix
kexec/arch/x86_64/crashdump-x86_64.c
---
kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c~kexec-tools-x86_64-backup-region-naming-consistency-fix
2006-07-28 09:17:02.000000000 -0700
+++ kexec-tools-1.101-vivek/kexec/arch/x86_64/crashdump-x86_64.c
2006-07-28 09:30:44.000000000 -0700
@@ -550,7 +550,7 @@ static int prepare_crash_memory_elf64_he
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;
@@ -600,12 +600,12 @@ int load_crashdump_segments(struct kexec
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,
_
_______________________________________________
fastboot mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/fastboot
