Commit 0b962d47 authored by H. Peter Anvin's avatar H. Peter Anvin

x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers

register_chrdev() hardcodes registering 256 minors, presumably to
avoid breaking old drivers.  However, we need to register enough
minors so that we have all possible CPUs.

checkpatch warns on this patch, but the patch is correct: NR_CPUS here
is a static *upper bound* on the *maximum CPU index* (not *number of
CPUs!*) and that is what we want.
Reported-and-tested-by: default avatarRuss Anderson <rja@sgi.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
LKML-Reference: <tip-*@git.kernel.org>
parent 54291362
...@@ -187,7 +187,8 @@ static int __init cpuid_init(void) ...@@ -187,7 +187,8 @@ static int __init cpuid_init(void)
int i, err = 0; int i, err = 0;
i = 0; i = 0;
if (register_chrdev(CPUID_MAJOR, "cpu/cpuid", &cpuid_fops)) { if (__register_chrdev(CPUID_MAJOR, 0, NR_CPUS,
"cpu/cpuid", &cpuid_fops)) {
printk(KERN_ERR "cpuid: unable to get major %d for cpuid\n", printk(KERN_ERR "cpuid: unable to get major %d for cpuid\n",
CPUID_MAJOR); CPUID_MAJOR);
err = -EBUSY; err = -EBUSY;
...@@ -216,7 +217,7 @@ static int __init cpuid_init(void) ...@@ -216,7 +217,7 @@ static int __init cpuid_init(void)
} }
class_destroy(cpuid_class); class_destroy(cpuid_class);
out_chrdev: out_chrdev:
unregister_chrdev(CPUID_MAJOR, "cpu/cpuid"); __unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");
out: out:
return err; return err;
} }
......
...@@ -246,7 +246,7 @@ static int __init msr_init(void) ...@@ -246,7 +246,7 @@ static int __init msr_init(void)
int i, err = 0; int i, err = 0;
i = 0; i = 0;
if (register_chrdev(MSR_MAJOR, "cpu/msr", &msr_fops)) { if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
printk(KERN_ERR "msr: unable to get major %d for msr\n", printk(KERN_ERR "msr: unable to get major %d for msr\n",
MSR_MAJOR); MSR_MAJOR);
err = -EBUSY; err = -EBUSY;
...@@ -274,7 +274,7 @@ static int __init msr_init(void) ...@@ -274,7 +274,7 @@ static int __init msr_init(void)
msr_device_destroy(i); msr_device_destroy(i);
class_destroy(msr_class); class_destroy(msr_class);
out_chrdev: out_chrdev:
unregister_chrdev(MSR_MAJOR, "cpu/msr"); __unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");
out: out:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment