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 v4 5/6] kexec, x86: set ext_cmd_line_ptr when boot_param is above 4g
Date: Sat, 24 Nov 2012 12:47:45 -0800 [thread overview]
Message-ID: <1353790066-20352-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1353790066-20352-1-git-send-email-yinghai@kernel.org>
update ext_cmd_line_ptr for bzImage from protocal 2.12
that could have command line above 4g.
-v2: update ext_... handling to the way that Eric likes.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
kexec/arch/i386/x86-linux-setup.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
index 3c31f64..d12dab1 100644
--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -103,7 +103,12 @@ void setup_linux_bootloader_parameters(
/* setup_move_size */
/* } */
if (real_mode->protocol_version >= 0x0202) {
- real_mode->cmd_line_ptr = real_mode_base + cmdline_offset;
+ unsigned long cmd_line_ptr = real_mode_base + cmdline_offset;
+
+ real_mode->cmd_line_ptr = cmd_line_ptr & 0xffffffffUL;
+ if ((real_mode->protocol_version >= 0x020c) &&
+ ((cmd_line_ptr & 0xffffffffUL) != cmd_line_ptr))
+ real_mode->ext_cmd_line_ptr = cmd_line_ptr >> 32;
}
/* Fill in the command line */
--
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-24 20:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-24 20:47 [PATCH v4 0/6] kexec: put bzImage and ramdisk above 4G for x86 64bit Yinghai Lu
2012-11-24 20:47 ` [PATCH v4 1/6] kexec, x86: clean boot_params area for entry-32bit path Yinghai Lu
2012-11-24 20:47 ` [PATCH v4 2/6] kexec, x86: Fix bzImage real-mode booting Yinghai Lu
2012-11-24 20:47 ` [PATCH v4 3/6] kexec, x86: add boot header member for version 2.12 Yinghai Lu
2012-11-24 20:47 ` [PATCH v4 4/6] kexec, x86: put ramdisk high for 64bit bzImage Yinghai Lu
2012-11-25 0:37 ` Yinghai Lu
2012-11-24 20:47 ` Yinghai Lu [this message]
2012-11-24 20:47 ` [PATCH v4 6/6] kexec, x86_64: Load bzImage64 above 4G Yinghai Lu
2012-11-25 0:38 ` Yinghai Lu
2012-11-25 0:42 ` H. Peter Anvin
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=1353790066-20352-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.