diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mach-default/setup.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index 37b9ae4d44c5..df167f265622 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
@@ -133,29 +133,28 @@ void __init time_init_hook(void) | |||
133 | **/ | 133 | **/ |
134 | void mca_nmi_hook(void) | 134 | void mca_nmi_hook(void) |
135 | { | 135 | { |
136 | /* If I recall correctly, there's a whole bunch of other things that | 136 | /* |
137 | * If I recall correctly, there's a whole bunch of other things that | ||
137 | * we can do to check for NMI problems, but that's all I know about | 138 | * we can do to check for NMI problems, but that's all I know about |
138 | * at the moment. | 139 | * at the moment. |
139 | */ | 140 | */ |
140 | 141 | pr_warning("NMI generated from unknown source!\n"); | |
141 | printk("NMI generated from unknown source!\n"); | ||
142 | } | 142 | } |
143 | #endif | 143 | #endif |
144 | 144 | ||
145 | static __init int no_ipi_broadcast(char *str) | 145 | static __init int no_ipi_broadcast(char *str) |
146 | { | 146 | { |
147 | get_option(&str, &no_broadcast); | 147 | get_option(&str, &no_broadcast); |
148 | printk ("Using %s mode\n", no_broadcast ? "No IPI Broadcast" : | 148 | pr_info("Using %s mode\n", |
149 | "IPI Broadcast"); | 149 | no_broadcast ? "No IPI Broadcast" : "IPI Broadcast"); |
150 | return 1; | 150 | return 1; |
151 | } | 151 | } |
152 | |||
153 | __setup("no_ipi_broadcast=", no_ipi_broadcast); | 152 | __setup("no_ipi_broadcast=", no_ipi_broadcast); |
154 | 153 | ||
155 | static int __init print_ipi_mode(void) | 154 | static int __init print_ipi_mode(void) |
156 | { | 155 | { |
157 | printk ("Using IPI %s mode\n", no_broadcast ? "No-Shortcut" : | 156 | pr_info("Using IPI %s mode\n", |
158 | "Shortcut"); | 157 | no_broadcast ? "No-Shortcut" : "Shortcut"); |
159 | return 0; | 158 | return 0; |
160 | } | 159 | } |
161 | 160 | ||