diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:35:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:35:20 -0700 |
commit | 39b2f8656e2af4d5d490ce6e33e4ba229cda3e33 (patch) | |
tree | f019abc77f2672ebfcf4635b36606f3ef0def342 /Documentation/x86 | |
parent | df8edfa9af5b2160549ed1a79b72e3ed13b6c7e2 (diff) | |
parent | 147ea09119e45caf2e8bf57c9e54cc930ccfeda9 (diff) |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 debug update from Ingo Molnar:
"Two small changes: a documentation update and a constification"
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, early-printk: Update earlyprintk documentation (and kill x86 copy)
x86: Constify a few items
Diffstat (limited to 'Documentation/x86')
-rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index e015a83c399..e9e8ddbbf37 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -91,20 +91,6 @@ APICs apicmaintimer. Useful when your PIT timer is totally broken. -Early Console - - syntax: earlyprintk=vga - earlyprintk=serial[,ttySn[,baudrate]] - - The early console is useful when the kernel crashes before the - normal console is initialized. It is not enabled by - default because it has some cosmetic problems. - Append ,keep to not disable it when the real console takes over. - Only vga or serial at a time, not both. - Currently only ttyS0 and ttyS1 are supported. - Interaction with the standard serial driver is not very good. - The VGA output is eventually overwritten by the real console. - Timing notsc |