Merge commit 'v2.6.29-rc1' into timers/hrtimers

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / cpuid.c

diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 85d28d53f5d357e59329bdcc1ada8328eb78f0b7..2ac1f0c2beb3ba54088d4e0c4e89622dbc03094d 100644 (file)
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -121,7 +121,7 @@ static int cpuid_open(struct inode *inode, struct file *file)
        lock_kernel();
 
        cpu = iminor(file->f_path.dentry->d_inode);
-       if (cpu >= NR_CPUS || !cpu_online(cpu)) {
+       if (cpu >= nr_cpu_ids || !cpu_online(cpu)) {
                ret = -ENXIO;   /* No such CPU */
                goto out;
        }