Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / lguest / lguest_user.c

diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index ff4a0bc9904d0b79149d4ace4de5d8bf572b2bb8..4263f4cc8c55c0668cfdd2e577a7d72a01dd472b 100644 (file)
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -250,13 +250,13 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
  */
 static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
 {
-       /* We have a limited number the number of CPUs in the lguest struct. */
+       /* We have a limited number of CPUs in the lguest struct. */
        if (id >= ARRAY_SIZE(cpu->lg->cpus))
                return -EINVAL;
 
        /* Set up this CPU's id, and pointer back to the lguest struct. */
        cpu->id = id;
-       cpu->lg = container_of((cpu - id), struct lguest, cpus[0]);
+       cpu->lg = container_of(cpu, struct lguest, cpus[id]);
        cpu->lg->nr_cpus++;
 
        /* Each CPU has a timer it can set. */
@@ -270,7 +270,7 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
        if (!cpu->regs_page)
                return -ENOMEM;
 
-       /* We actually put the registers at the bottom of the page. */
+       /* We actually put the registers at the end of the page. */
        cpu->regs = (void *)cpu->regs_page + PAGE_SIZE - sizeof(*cpu->regs);
 
        /*