diff options
| author | Wang Nan <wangnan0@huawei.com> | 2014-05-29 17:20:03 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2014-05-30 14:24:41 +0900 |
| commit | 3c9c3b1c4688178f328f3924eed96c308e0e611c (patch) | |
| tree | 163e8e948fdc1c3ad7f2c655bc854905fa134d76 /kexec/arch/arm/crashdump-arm.c | |
| parent | 199bc59ca34ef1a0ce78aa9aa054dac53c5751bb (diff) | |
kexec-tools: add --page-offset option for ARM
When KALLSYMS is disabled or /proc is not mounted, this patch allows
--page-offset cmdline option for user to setup correct page_offset.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/arm/crashdump-arm.c')
| -rw-r--r-- | kexec/arch/arm/crashdump-arm.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index e6ff3e0..d124974 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -60,6 +60,7 @@ static struct crash_elf_info elf_info = { }; unsigned long phys_offset; +extern unsigned long long user_page_offset; /* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */ static unsigned long long get_kernel_stext_sym(void) @@ -95,10 +96,24 @@ static int get_kernel_page_offset(struct kexec_info *info, { unsigned long long stext_sym_addr = get_kernel_stext_sym(); if (stext_sym_addr == 0) { + if (user_page_offset != (-1ULL)) { + elf_info->page_offset = user_page_offset; + dbgprintf("Unable to get _stext symbol from /proc/kallsyms, " + "use user provided vaule: %llx\n", + elf_info->page_offset); + return 0; + } elf_info->page_offset = (unsigned long long)DEFAULT_PAGE_OFFSET; - dbgprintf("Unable to get _stext symbol from /proc/kallsyms, use default: %llx\n", + dbgprintf("Unable to get _stext symbol from /proc/kallsyms, " + "use default: %llx\n", elf_info->page_offset); return 0; + } else if ((user_page_offset != (-1ULL)) && + (user_page_offset != stext_sym_addr)) { + fprintf(stderr, "PAGE_OFFSET is set to %llx " + "instead of user provided value %llx\n", + stext_sym_addr & (~KVBASE_MASK), + user_page_offset); } elf_info->page_offset = stext_sym_addr & (~KVBASE_MASK); dbgprintf("page_offset is set to %llx\n", elf_info->page_offset); |