diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-09-07 12:05:40 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-09-09 17:02:48 +0900 |
| commit | edde04f854800eeed21d29a733aca0abc20990eb (patch) | |
| tree | e82fefcbc6033d36d5d283cfaa04fcb4b18ec645 /kexec/crashdump-elf.c | |
| parent | d9bf000b6260ee4558b2d2eb3af08e09cd1fe794 (diff) | |
crashdump: Move kern_vaddr_start from kexec_info into crash_elf_info
These fields as defined in kexec_info are not biarch safe and
beyond that crash_elf_info is the structure for passing this kind
of information not kexec_info. So move them in prepartion for
properly cleaning up biarch x86 functionality.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
[ horms@verge.net.au: converted stray elf_info-> to elf_info. ]
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/crashdump-elf.c')
| -rw-r--r-- | kexec/crashdump-elf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c index f000e42..954d670 100644 --- a/kexec/crashdump-elf.c +++ b/kexec/crashdump-elf.c @@ -68,7 +68,7 @@ int FUNC(struct kexec_info *info, /* * Certain architectures such as x86_64 and ia64 require a separate * PT_LOAD program header for the kernel. This is controlled through - * info->kern_size. + * elf_info->kern_size. * * The separate PT_LOAD program header is required either because the * kernel is mapped at a different location than the rest of the @@ -85,7 +85,7 @@ int FUNC(struct kexec_info *info, * PT_LOAD program header and in the physical RAM program headers. */ - if (info->kern_size && !xen_present()) { + if (elf_info->kern_size && !xen_present()) { sz += sizeof(PHDR); } @@ -195,17 +195,17 @@ int FUNC(struct kexec_info *info, } /* Setup an PT_LOAD type program header for the region where - * Kernel is mapped if info->kern_size is non-zero. + * Kernel is mapped if elf_info->kern_size is non-zero. */ - if (info->kern_size && !xen_present()) { + if (elf_info->kern_size && !xen_present()) { phdr = (PHDR *) bufp; bufp += sizeof(PHDR); phdr->p_type = PT_LOAD; phdr->p_flags = PF_R|PF_W|PF_X; - phdr->p_offset = phdr->p_paddr = info->kern_paddr_start; - phdr->p_vaddr = info->kern_vaddr_start; - phdr->p_filesz = phdr->p_memsz = info->kern_size; + phdr->p_offset = phdr->p_paddr = elf_info->kern_paddr_start; + phdr->p_vaddr = elf_info->kern_vaddr_start; + phdr->p_filesz = phdr->p_memsz = elf_info->kern_size; phdr->p_align = 0; (elf->e_phnum)++; dbgprintf_phdr("Kernel text Elf header", phdr); |