diff options
author | Baoquan He <bhe@redhat.com> | 2014-10-13 18:53:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:18:21 -0400 |
commit | a2d6aa8fa0750fe1d2fc9673d4a46b2fd87e44b3 (patch) | |
tree | 87a101e8d879885b8515eefc338e2e99a105b15e /arch/x86/kernel/crash.c | |
parent | 669280a152ce5144321c0e511498877383f34393 (diff) |
kexec: check if crashk_res_low exists when exclude it from crash mem ranges
Add a check if crashk_res_low exists just like GART region does. If
crashk_res_low doesn't exist, calling exclude_mem_range is unnecessary.
Meanwhile, since crashk_res_low has been initialized at definition, it's
safe just use "if (crashk_low_res.end)" to check if it's exist. And this
can make it consistent with other places of check.
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/crash.c')
-rw-r--r-- | arch/x86/kernel/crash.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index a618fcd2c07d..f5ab56d14287 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -237,7 +237,7 @@ static void fill_up_crash_elf_data(struct crash_elf_data *ced, | |||
237 | ced->max_nr_ranges++; | 237 | ced->max_nr_ranges++; |
238 | 238 | ||
239 | /* If crashk_low_res is not 0, another range split possible */ | 239 | /* If crashk_low_res is not 0, another range split possible */ |
240 | if (crashk_low_res.end != 0) | 240 | if (crashk_low_res.end) |
241 | ced->max_nr_ranges++; | 241 | ced->max_nr_ranges++; |
242 | } | 242 | } |
243 | 243 | ||
@@ -335,9 +335,11 @@ static int elf_header_exclude_ranges(struct crash_elf_data *ced, | |||
335 | if (ret) | 335 | if (ret) |
336 | return ret; | 336 | return ret; |
337 | 337 | ||
338 | ret = exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); | 338 | if (crashk_low_res.end) { |
339 | if (ret) | 339 | ret = exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); |
340 | return ret; | 340 | if (ret) |
341 | return ret; | ||
342 | } | ||
341 | 343 | ||
342 | /* Exclude GART region */ | 344 | /* Exclude GART region */ |
343 | if (ced->gart_end) { | 345 | if (ced->gart_end) { |