lguest: avoid using NR_CPUS as a bounds check.

[linux-2.6-omap-h63xx.git] / drivers / lguest / lguest_user.c

diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 564e425d71dd37747735e8ba47ed1b1881a022cb..4017701a178877da0f4258cc92f442ce4b1ec1de 100644 (file)
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -102,7 +102,7 @@ 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. */
-       if (id >= NR_CPUS)
+       if (id >= ARRAY_SIZE(cpu->lg->cpus))
                return -EINVAL;
 
        /* Set up this CPU's id, and pointer back to the lguest struct. */
@@ -189,7 +189,7 @@ static int initialize(struct file *file, const unsigned long __user *input)
        }
 
        /* Populate the easy fields of our "struct lguest" */
-       lg->mem_base = (void __user *)(long)args[0];
+       lg->mem_base = (void __user *)args[0];
        lg->pfn_limit = args[1];
 
        /* This is the first cpu (cpu 0) and it will start booting at args[3] */