diff options
author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-02-27 20:03:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 22:10:12 -0500 |
commit | 8a525f5e7a9f1e15e93c63fe179a5a4463dde4e1 (patch) | |
tree | 112be83acb8fc9b3f0525e81615b197e6f1634d0 /kernel | |
parent | 8d67091ec6ae98ca67f77990ef9e9ec21337f077 (diff) |
kexec: get rid of duplicate check for hole_end
hole_end has been checked to make sure it is <= crash_res.end in the while
condition check, so the if condition check is duplicate.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Reviewed-by: "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 'kernel')
-rw-r--r-- | kernel/kexec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 7d44a9f94145..ea097ad7cc37 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -503,8 +503,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, | |||
503 | 503 | ||
504 | if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) | 504 | if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) |
505 | break; | 505 | break; |
506 | if (hole_end > crashk_res.end) | ||
507 | break; | ||
508 | /* See if I overlap any of the segments */ | 506 | /* See if I overlap any of the segments */ |
509 | for (i = 0; i < image->nr_segments; i++) { | 507 | for (i = 0; i < image->nr_segments; i++) { |
510 | unsigned long mstart, mend; | 508 | unsigned long mstart, mend; |