summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Yanfei <zhangyanfei@cn.fujitsu.com>2013-02-27 17:03:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 19:10:12 -0800
commit8a525f5e7a9f1e15e93c63fe179a5a4463dde4e1 (patch)
tree112be83acb8fc9b3f0525e81615b197e6f1634d0
parent8d67091ec6ae98ca67f77990ef9e9ec21337f077 (diff)
downloadop-kernel-dev-8a525f5e7a9f1e15e93c63fe179a5a4463dde4e1.zip
op-kernel-dev-8a525f5e7a9f1e15e93c63fe179a5a4463dde4e1.tar.gz
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>
-rw-r--r--kernel/kexec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 7d44a9f..ea097ad 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -503,8 +503,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT)
break;
- if (hole_end > crashk_res.end)
- break;
/* See if I overlap any of the segments */
for (i = 0; i < image->nr_segments; i++) {
unsigned long mstart, mend;
OpenPOWER on IntegriCloud