diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/early_printk.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index cff84cd9987f..a8f965dd58df 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c | |||
@@ -108,12 +108,12 @@ static __init void early_serial_init(char *s) | |||
108 | 108 | ||
109 | if (*s) { | 109 | if (*s) { |
110 | unsigned port; | 110 | unsigned port; |
111 | if (!strncmp(s,"0x",2)) { | 111 | if (!strncmp(s, "0x", 2)) { |
112 | early_serial_base = simple_strtoul(s, &e, 16); | 112 | early_serial_base = simple_strtoul(s, &e, 16); |
113 | } else { | 113 | } else { |
114 | static int bases[] = { 0x3f8, 0x2f8 }; | 114 | static int bases[] = { 0x3f8, 0x2f8 }; |
115 | 115 | ||
116 | if (!strncmp(s,"ttyS",4)) | 116 | if (!strncmp(s, "ttyS", 4)) |
117 | s += 4; | 117 | s += 4; |
118 | port = simple_strtoul(s, &e, 10); | 118 | port = simple_strtoul(s, &e, 10); |
119 | if (port > 1 || s == e) | 119 | if (port > 1 || s == e) |
@@ -202,9 +202,9 @@ void early_printk(const char *fmt, ...) | |||
202 | int n; | 202 | int n; |
203 | va_list ap; | 203 | va_list ap; |
204 | 204 | ||
205 | va_start(ap,fmt); | 205 | va_start(ap, fmt); |
206 | n = vscnprintf(buf,512,fmt,ap); | 206 | n = vscnprintf(buf, 512, fmt, ap); |
207 | early_console->write(early_console,buf,n); | 207 | early_console->write(early_console, buf, n); |
208 | va_end(ap); | 208 | va_end(ap); |
209 | } | 209 | } |
210 | 210 | ||
@@ -229,15 +229,15 @@ static int __init setup_early_printk(char *buf) | |||
229 | early_serial_init(buf); | 229 | early_serial_init(buf); |
230 | early_console = &early_serial_console; | 230 | early_console = &early_serial_console; |
231 | } else if (!strncmp(buf, "vga", 3) | 231 | } else if (!strncmp(buf, "vga", 3) |
232 | && boot_params.screen_info.orig_video_isVGA == 1) { | 232 | && boot_params.screen_info.orig_video_isVGA == 1) { |
233 | max_xpos = boot_params.screen_info.orig_video_cols; | 233 | max_xpos = boot_params.screen_info.orig_video_cols; |
234 | max_ypos = boot_params.screen_info.orig_video_lines; | 234 | max_ypos = boot_params.screen_info.orig_video_lines; |
235 | current_ypos = boot_params.screen_info.orig_y; | 235 | current_ypos = boot_params.screen_info.orig_y; |
236 | early_console = &early_vga_console; | 236 | early_console = &early_vga_console; |
237 | } else if (!strncmp(buf, "simnow", 6)) { | 237 | } else if (!strncmp(buf, "simnow", 6)) { |
238 | simnow_init(buf + 6); | 238 | simnow_init(buf + 6); |
239 | early_console = &simnow_console; | 239 | early_console = &simnow_console; |
240 | keep_early = 1; | 240 | keep_early = 1; |
241 | #ifdef CONFIG_HVC_XEN | 241 | #ifdef CONFIG_HVC_XEN |
242 | } else if (!strncmp(buf, "xen", 3)) { | 242 | } else if (!strncmp(buf, "xen", 3)) { |
243 | early_console = &xenboot_console; | 243 | early_console = &xenboot_console; |