diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-21 12:48:06 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-21 12:48:06 -0700 |
commit | 11032c17bd3f96a4319e4415c07fc791525b79fd (patch) | |
tree | 1a0a4e57338bcebe34819454b24576e3f0550c4c /arch/sparc | |
parent | ddd53bf11172822bc02b32b876a491010257d1b0 (diff) | |
download | linux-3.10-11032c17bd3f96a4319e4415c07fc791525b79fd.tar.gz linux-3.10-11032c17bd3f96a4319e4415c07fc791525b79fd.tar.bz2 linux-3.10-11032c17bd3f96a4319e4415c07fc791525b79fd.zip |
sparc: Make '-p' boot option meaningful again.
If "-p" is given on the command line, clear the CON_BOOT
flag for the initial early boot PROM console.
This is necessary to try and see crash messages that occur
between the registry of the VT console and the probing of
the first framebuffer or serial console. During this time
no console messages are emitted because the VT console
registry (even if no backend is registered to it) removes
the early console if CON_BOOT is set.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/setup_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/setup_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index d26e1f6c717..3e3e2914c70 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -137,7 +137,7 @@ static void __init process_switch(char c) prom_halt(); break; case 'p': - /* Just ignore, this behavior is now the default. */ + prom_early_console.flags &= ~CON_BOOT; break; default: printk("Unknown boot switch (-%c)\n", c); diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 4139289a25f..c965595aa7e 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -106,7 +106,7 @@ static void __init process_switch(char c) prom_halt(); break; case 'p': - /* Just ignore, this behavior is now the default. */ + prom_early_console.flags &= ~CON_BOOT; break; case 'P': /* Force UltraSPARC-III P-Cache on. */ |