diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
commit | 76d32a87adac2aaaaf5a4134f225ede4f37f7678 (patch) | |
tree | 15d743f8da99c38f52190e11e1788c90f49385ae /arch/x86/kernel/msr.c | |
parent | 92221d1fc707b50772262839aef545c1f5fbc94e (diff) | |
parent | 1247de2692e051a667238787385a65e8ea9bbaee (diff) |
Merge branch 'cpuinit/master'
Diffstat (limited to 'arch/x86/kernel/msr.c')
-rw-r--r-- | arch/x86/kernel/msr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index ce130493b802..88458faea2f8 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -200,7 +200,7 @@ static const struct file_operations msr_fops = { .compat_ioctl = msr_ioctl, }; -static int __cpuinit msr_device_create(int cpu) +static int msr_device_create(int cpu) { struct device *dev; @@ -214,8 +214,8 @@ static void msr_device_destroy(int cpu) device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu)); } -static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb, - unsigned long action, void *hcpu) +static int msr_class_cpu_callback(struct notifier_block *nfb, + unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; int err = 0; |