From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from userp1040.oracle.com ([156.151.31.81]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TaHdB-0005qo-Aj for kexec@lists.infradead.org; Mon, 19 Nov 2012 03:02:43 +0000 From: Yinghai Lu Subject: [PATCH 4/6] kexec, x86: set ext_cmd_line_ptr when boot_param is put high Date: Sun, 18 Nov 2012 19:02:29 -0800 Message-Id: <1353294151-32133-5-git-send-email-yinghai@kernel.org> In-Reply-To: <1353294151-32133-1-git-send-email-yinghai@kernel.org> References: <878v9zp55t.fsf@xmission.com> <1353294151-32133-1-git-send-email-yinghai@kernel.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Simon Horman , "H. Peter Anvin" , Vivek Goyal , Haren Myneni , "Eric W. Biederman" Cc: Yinghai Lu , kexec@lists.infradead.org only do that for bzImage64, and it could have command line above 4g. Signed-off-by: Yinghai Lu --- kexec/arch/i386/x86-linux-setup.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c index b0e6119..c929166 100644 --- a/kexec/arch/i386/x86-linux-setup.c +++ b/kexec/arch/i386/x86-linux-setup.c @@ -105,7 +105,13 @@ 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 & 0xffffffff; + if (real_mode->protocol_version >= 0x020c) + real_mode->ext_cmd_line_ptr = cmd_line_ptr >> 32; + + printf("cmd_line_ptr: %lx\n", cmd_line_ptr); } /* Fill in the command line */ -- 1.7.7 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec