diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 0d4102031a4c..5f277cad2ed7 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
| @@ -1201,7 +1201,7 @@ int mce_notify_irq(void) | |||
| 1201 | } | 1201 | } |
| 1202 | EXPORT_SYMBOL_GPL(mce_notify_irq); | 1202 | EXPORT_SYMBOL_GPL(mce_notify_irq); |
| 1203 | 1203 | ||
| 1204 | static int mce_banks_init(void) | 1204 | static int __cpuinit __mcheck_cpu_mce_banks_init(void) |
| 1205 | { | 1205 | { |
| 1206 | int i; | 1206 | int i; |
| 1207 | 1207 | ||
| @@ -1242,7 +1242,7 @@ static int __cpuinit __mcheck_cpu_cap_init(void) | |||
| 1242 | WARN_ON(banks != 0 && b != banks); | 1242 | WARN_ON(banks != 0 && b != banks); |
| 1243 | banks = b; | 1243 | banks = b; |
| 1244 | if (!mce_banks) { | 1244 | if (!mce_banks) { |
| 1245 | int err = mce_banks_init(); | 1245 | int err = __mcheck_cpu_mce_banks_init(); |
| 1246 | 1246 | ||
| 1247 | if (err) | 1247 | if (err) |
| 1248 | return err; | 1248 | return err; |
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 8a73d5c12a05..4fef985fc221 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c | |||
| @@ -268,7 +268,7 @@ void __init mcheck_intel_therm_init(void) | |||
| 268 | lvtthmr_init = apic_read(APIC_LVTTHMR); | 268 | lvtthmr_init = apic_read(APIC_LVTTHMR); |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | void __init intel_init_thermal(struct cpuinfo_x86 *c) | 271 | void intel_init_thermal(struct cpuinfo_x86 *c) |
| 272 | { | 272 | { |
| 273 | unsigned int cpu = smp_processor_id(); | 273 | unsigned int cpu = smp_processor_id(); |
| 274 | int tm2 = 0; | 274 | int tm2 = 0; |
