From: Rusty Russell <rusty@rustcorp.com.au>

Andrew patched up lguest after the boot parameters became a proper
structure, but in fact it can be considerably neatened.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/lguest/lguest.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/lguest/lguest.c~lguest-the-host-code-update-for-mm-simplify-boot_params drivers/lguest/lguest.c
--- a/drivers/lguest/lguest.c~lguest-the-host-code-update-for-mm-simplify-boot_params
+++ a/drivers/lguest/lguest.c
@@ -444,8 +444,7 @@ __init void lguest_init(void *boot)
 {
 	/* Copy boot parameters first. */
 	memcpy(&boot_params, boot, PARAM_SIZE);
-	memcpy(boot_command_line,
-	       __va(*(unsigned long *)((void *)&boot_params + NEW_CL_POINTER)),
+	memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
 	       COMMAND_LINE_SIZE);
 
 	paravirt_ops.name = "lguest";
_