From: Yinghai Lu <yinghai@kernel.org>
To: Simon Horman <horms@verge.net.au>,
"H. Peter Anvin" <hpa@zytor.com>, Vivek Goyal <vgoyal@redhat.com>,
Haren Myneni <hbabu@us.ibm.com>,
"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Yinghai Lu <yinghai@kernel.org>, kexec@lists.infradead.org
Subject: [PATCH v2 2/6] kexec: don't die during buffer finding
Date: Sun, 18 Nov 2012 19:04:34 -0800 [thread overview]
Message-ID: <1353294278-32230-3-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1353294278-32230-1-git-send-email-yinghai@kernel.org>
could return 0, and let the caller retry with new ranges.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
kexec/kexec.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/kexec/kexec.c b/kexec/kexec.c
index 8928be0..0f8aec8 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -366,10 +366,9 @@ unsigned long add_buffer_phys_virt(struct kexec_info *info,
memsz = (memsz + (pagesize - 1)) & ~(pagesize - 1);
base = locate_hole(info, memsz, buf_align, buf_min, buf_max, buf_end);
- if (base == ULONG_MAX) {
- die("locate_hole failed\n");
- }
-
+ if (base == ULONG_MAX)
+ return 0;
+
add_segment_phys_virt(info, buf, bufsz, base, memsz, phys);
return base;
}
--
1.7.7
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2012-11-19 3:04 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-16 23:04 [PATCH 0/8] kexec: put bzImage and ramdisk above 4G for x86 64bit Yinghai Lu
2012-11-16 23:04 ` [PATCH 1/8] Add min/max macro Yinghai Lu
2012-11-16 23:04 ` [PATCH 2/8] x86: add boot header member for version 2.12 Yinghai Lu
2012-11-16 23:04 ` [PATCH 3/8] add mem64_min/max control Yinghai Lu
2012-11-17 6:18 ` Eric W. Biederman
2012-11-17 7:06 ` Yinghai Lu
2012-11-17 8:25 ` Eric W. Biederman
2012-11-17 20:04 ` Yinghai Lu
2012-11-17 20:41 ` H. Peter Anvin
2012-11-17 20:51 ` Yinghai Lu
2012-11-17 20:54 ` H. Peter Anvin
2012-11-18 0:44 ` Yinghai Lu
2012-11-18 4:34 ` H. Peter Anvin
2012-11-18 4:47 ` Eric W. Biederman
2012-11-18 4:55 ` H. Peter Anvin
2012-11-18 5:00 ` Eric W. Biederman
2012-11-18 5:14 ` H. Peter Anvin
2012-11-18 4:56 ` Yinghai Lu
2012-11-18 5:20 ` Eric W. Biederman
2012-11-18 5:35 ` Yinghai Lu
2012-11-18 5:39 ` Yinghai Lu
2012-11-18 5:58 ` Yinghai Lu
2012-11-18 6:11 ` Eric W. Biederman
2012-11-18 6:32 ` Yinghai Lu
2012-11-18 6:38 ` Yinghai Lu
2012-11-18 6:50 ` Eric W. Biederman
2012-11-18 6:53 ` Yinghai Lu
2012-11-18 7:18 ` Yinghai Lu
2012-11-18 10:38 ` Eric W. Biederman
2012-11-19 3:02 ` [PATCH 0/6] kexec: put bzImage and ramdisk above 4G for x86 64bit Yinghai Lu
2012-11-19 3:02 ` [PATCH 1/6] kexec, x86: add boot header member for version 2.12 Yinghai Lu
2012-11-19 3:02 ` [PATCH 2/6] kexec: don't die during buffer finding Yinghai Lu
2012-11-19 3:02 ` [PATCH 3/6] kexec, x86: put ramdisk high for 64bit bzImage Yinghai Lu
2012-11-19 3:02 ` [PATCH 4/6] kexec, x86: set ext_cmd_line_ptr when boot_param is put high Yinghai Lu
2012-11-19 3:02 ` [PATCH 5/6] kexec, x86: Make x64_64 purgatory relocatable above 4G Yinghai Lu
2012-11-19 3:02 ` [PATCH 6/6] kexec, x86_64: put 64bit bzImage high Yinghai Lu
2012-11-19 3:04 ` [PATCH v2 0/6] kexec: put bzImage and ramdisk above 4G for x86 64bit Yinghai Lu
2012-11-19 3:04 ` [PATCH v2 1/6] kexec, x86: add boot header member for version 2.12 Yinghai Lu
2012-11-19 3:04 ` Yinghai Lu [this message]
2012-11-19 17:05 ` [PATCH v2 2/6] kexec: don't die during buffer finding Eric W. Biederman
2012-11-19 3:04 ` [PATCH v2 3/6] kexec, x86: put ramdisk high for 64bit bzImage Yinghai Lu
2012-11-19 17:20 ` Eric W. Biederman
2012-11-19 3:04 ` [PATCH v2 4/6] kexec, x86: set ext_cmd_line_ptr when boot_param is put high Yinghai Lu
2012-11-19 17:22 ` Eric W. Biederman
2012-11-19 3:04 ` [PATCH v2 5/6] kexec, x86: Make x64_64 purgatory relocatable above 4G Yinghai Lu
2012-11-19 3:04 ` [PATCH v2 6/6] kexec, x86_64: put 64bit bzImage high Yinghai Lu
2012-11-19 17:28 ` Eric W. Biederman
2012-11-19 17:04 ` [PATCH v2 0/6] kexec: put bzImage and ramdisk above 4G for x86 64bit Eric W. Biederman
2012-11-18 6:24 ` [PATCH 3/8] add mem64_min/max control H. Peter Anvin
2012-11-18 6:23 ` H. Peter Anvin
2012-11-18 6:44 ` Eric W. Biederman
2012-11-16 23:04 ` [PATCH 4/8] Move out mem_min/max checking in locate_hole Yinghai Lu
2012-11-16 23:04 ` [PATCH 5/8] seperate checking 64bit mem range Yinghai Lu
2012-11-16 23:04 ` [PATCH 6/8] debug print out for add_buf Yinghai Lu
2012-11-16 23:04 ` [PATCH 7/8] x86: put ramdisk high for 64bit bzImage Yinghai Lu
2012-11-16 23:04 ` [PATCH 8/8] x86: put 64bit bzImage high Yinghai Lu
2012-11-17 6:33 ` Eric W. Biederman
[not found] ` <CAE9FiQWJaT9yfdV0rgV-5rM=BR4eX8sr+a99g8Ggf-+YkD8qgQ@mail.gmail.com>
2012-11-17 8:43 ` Eric W. Biederman
2012-11-19 21:00 ` [PATCH 0/8] kexec: put bzImage and ramdisk above 4G for x86 64bit Vivek Goyal
2012-11-19 22:34 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353294278-32230-3-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=ebiederm@xmission.com \
--cc=hbabu@us.ibm.com \
--cc=horms@verge.net.au \
--cc=hpa@zytor.com \
--cc=kexec@lists.infradead.org \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox