From 031129be93ff82c56311c72d84aa470481962d8c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 11 Sep 2007 17:06:37 +1000 Subject: [PATCH] --- yaml --- r: 64904 b: refs/heads/master c: c413fecc763e380ec93dc6faf726e7e735ade04e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/lguest/lguest.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7c1ca822bc6f..09009dde282c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9863b78a1a82347fa1e727bdca0110151a5c4f10 +refs/heads/master: c413fecc763e380ec93dc6faf726e7e735ade04e diff --git a/trunk/drivers/lguest/lguest.c b/trunk/drivers/lguest/lguest.c index 6e135ac0834f..ee1c6d05c3d3 100644 --- a/trunk/drivers/lguest/lguest.c +++ b/trunk/drivers/lguest/lguest.c @@ -964,11 +964,12 @@ __init void lguest_init(void *boot) { /* Copy boot parameters first: the Launcher put the physical location * in %esi, and head.S converted that to a virtual address and handed - * it to us. */ - memcpy(&boot_params, boot, PARAM_SIZE); + * it to us. We use "__memcpy" because "memcpy" sometimes tries to do + * tricky things to go faster, and we're not ready for that. */ + __memcpy(&boot_params, boot, PARAM_SIZE); /* The boot parameters also tell us where the command-line is: save * that, too. */ - memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), + __memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), COMMAND_LINE_SIZE); /* We're under lguest, paravirt is enabled, and we're running at