diff options
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d43cad74f166..8b6a3bb57d8e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -933,7 +933,7 @@ static const struct msr_range msr_range_array[] __cpuinitconst = { | |||
933 | { 0xc0011000, 0xc001103b}, | 933 | { 0xc0011000, 0xc001103b}, |
934 | }; | 934 | }; |
935 | 935 | ||
936 | static void __cpuinit print_cpu_msr(void) | 936 | static void __cpuinit __print_cpu_msr(void) |
937 | { | 937 | { |
938 | unsigned index_min, index_max; | 938 | unsigned index_min, index_max; |
939 | unsigned index; | 939 | unsigned index; |
@@ -997,13 +997,13 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) | |||
997 | else | 997 | else |
998 | printk(KERN_CONT "\n"); | 998 | printk(KERN_CONT "\n"); |
999 | 999 | ||
1000 | #ifdef CONFIG_SMP | 1000 | __print_cpu_msr(); |
1001 | } | ||
1002 | |||
1003 | void __cpuinit print_cpu_msr(struct cpuinfo_x86 *c) | ||
1004 | { | ||
1001 | if (c->cpu_index < show_msr) | 1005 | if (c->cpu_index < show_msr) |
1002 | print_cpu_msr(); | 1006 | __print_cpu_msr(); |
1003 | #else | ||
1004 | if (show_msr) | ||
1005 | print_cpu_msr(); | ||
1006 | #endif | ||
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | static __init int setup_disablecpuid(char *arg) | 1009 | static __init int setup_disablecpuid(char *arg) |