diff options
Diffstat (limited to 'arch/x86/kernel/cpuid.c')
| -rw-r--r-- | arch/x86/kernel/cpuid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 1e4dbcfe6d31..7d9481c743f8 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
| @@ -137,7 +137,7 @@ static const struct file_operations cpuid_fops = { | |||
| 137 | .open = cpuid_open, | 137 | .open = cpuid_open, |
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | static __cpuinit int cpuid_device_create(int cpu) | 140 | static int cpuid_device_create(int cpu) |
| 141 | { | 141 | { |
| 142 | struct device *dev; | 142 | struct device *dev; |
| 143 | 143 | ||
| @@ -151,9 +151,8 @@ static void cpuid_device_destroy(int cpu) | |||
| 151 | device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu)); | 151 | device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu)); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, | 154 | static int cpuid_class_cpu_callback(struct notifier_block *nfb, |
| 155 | unsigned long action, | 155 | unsigned long action, void *hcpu) |
| 156 | void *hcpu) | ||
| 157 | { | 156 | { |
| 158 | unsigned int cpu = (unsigned long)hcpu; | 157 | unsigned int cpu = (unsigned long)hcpu; |
| 159 | int err = 0; | 158 | int err = 0; |
