diff options
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 5f58f8cb9836..2d8782960f41 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
@@ -1459,6 +1459,16 @@ void __init setup_arch(char **cmdline_p) | |||
1459 | 1459 | ||
1460 | parse_cmdline_early(cmdline_p); | 1460 | parse_cmdline_early(cmdline_p); |
1461 | 1461 | ||
1462 | #ifdef CONFIG_EARLY_PRINTK | ||
1463 | { | ||
1464 | char *s = strstr(*cmdline_p, "earlyprintk="); | ||
1465 | if (s) { | ||
1466 | setup_early_printk(strchr(s, '=') + 1); | ||
1467 | printk("early console enabled\n"); | ||
1468 | } | ||
1469 | } | ||
1470 | #endif | ||
1471 | |||
1462 | max_low_pfn = setup_memory(); | 1472 | max_low_pfn = setup_memory(); |
1463 | 1473 | ||
1464 | /* | 1474 | /* |
@@ -1483,19 +1493,6 @@ void __init setup_arch(char **cmdline_p) | |||
1483 | * NOTE: at this point the bootmem allocator is fully available. | 1493 | * NOTE: at this point the bootmem allocator is fully available. |
1484 | */ | 1494 | */ |
1485 | 1495 | ||
1486 | #ifdef CONFIG_EARLY_PRINTK | ||
1487 | { | ||
1488 | char *s = strstr(*cmdline_p, "earlyprintk="); | ||
1489 | if (s) { | ||
1490 | extern void setup_early_printk(char *); | ||
1491 | |||
1492 | setup_early_printk(strchr(s, '=') + 1); | ||
1493 | printk("early console enabled\n"); | ||
1494 | } | ||
1495 | } | ||
1496 | #endif | ||
1497 | |||
1498 | |||
1499 | dmi_scan_machine(); | 1496 | dmi_scan_machine(); |
1500 | 1497 | ||
1501 | #ifdef CONFIG_X86_GENERICARCH | 1498 | #ifdef CONFIG_X86_GENERICARCH |