diff options
| -rw-r--r-- | drivers/lguest/lguest.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c index 6e135ac0834f..ee1c6d05c3d3 100644 --- a/drivers/lguest/lguest.c +++ b/drivers/lguest/lguest.c | |||
| @@ -964,11 +964,12 @@ __init void lguest_init(void *boot) | |||
| 964 | { | 964 | { |
| 965 | /* Copy boot parameters first: the Launcher put the physical location | 965 | /* Copy boot parameters first: the Launcher put the physical location |
| 966 | * in %esi, and head.S converted that to a virtual address and handed | 966 | * in %esi, and head.S converted that to a virtual address and handed |
| 967 | * it to us. */ | 967 | * it to us. We use "__memcpy" because "memcpy" sometimes tries to do |
| 968 | memcpy(&boot_params, boot, PARAM_SIZE); | 968 | * tricky things to go faster, and we're not ready for that. */ |
| 969 | __memcpy(&boot_params, boot, PARAM_SIZE); | ||
| 969 | /* The boot parameters also tell us where the command-line is: save | 970 | /* The boot parameters also tell us where the command-line is: save |
| 970 | * that, too. */ | 971 | * that, too. */ |
| 971 | memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), | 972 | __memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), |
| 972 | COMMAND_LINE_SIZE); | 973 | COMMAND_LINE_SIZE); |
| 973 | 974 | ||
| 974 | /* We're under lguest, paravirt is enabled, and we're running at | 975 | /* We're under lguest, paravirt is enabled, and we're running at |