always reserve elfcore header memory in crash kernel
elfcore header memory needs to be reserved in a crash kernel. This means that the relevant code should be protected by CONFIG_CRASH_DUMP rather than CONFIG_PROC_VMCORE. Signed-off-by: Simon Horman <horms@verge.net.au> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
85a0ee342e
commit
d9a9855d0b
2 changed files with 2 additions and 4 deletions
|
@ -1335,7 +1335,7 @@ kdump_find_rsvd_region (unsigned long size, struct rsvd_region *r, int n)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PROC_VMCORE
|
||||
#ifdef CONFIG_CRASH_DUMP
|
||||
/* locate the size find a the descriptor at a certain address */
|
||||
unsigned long __init
|
||||
vmcore_find_descriptor_size (unsigned long address)
|
||||
|
|
|
@ -352,7 +352,7 @@ reserve_memory (void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PROC_VMCORE
|
||||
#ifdef CONFIG_CRASH_KERNEL
|
||||
if (reserve_elfcorehdr(&rsvd_region[n].start,
|
||||
&rsvd_region[n].end) == 0)
|
||||
n++;
|
||||
|
@ -496,9 +496,7 @@ static int __init parse_elfcorehdr(char *arg)
|
|||
return 0;
|
||||
}
|
||||
early_param("elfcorehdr", parse_elfcorehdr);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PROC_VMCORE
|
||||
int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
|
||||
{
|
||||
unsigned long length;
|
||||
|
|
Loading…
Reference in a new issue