summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:02:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:02:18 -0700
commit46302b46e5cf9e23859360e38c540be6e3465c6b (patch)
tree0ffa9e4493bcba6985895045187f807d5fd99a99 /Documentation
parent5b1755f23b98e0afaedaec8344002ab184646286 (diff)
parent24e35800cdc4350fc34e2bed37b608a9e13ab3b6 (diff)
downloadlinux-stable-46302b46e5cf9e23859360e38c540be6e3465c6b.tar.gz
linux-stable-46302b46e5cf9e23859360e38c540be6e3465c6b.tar.bz2
linux-stable-46302b46e5cf9e23859360e38c540be6e3465c6b.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Don't leak 64-bit kernel register values to 32-bit processes x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y x86: Fix csum_ipv6_magic asm memory clobber x86: Optimize cmpxchg64() at build-time some more
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6fa7292947e5..9107b387e91f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -671,6 +671,7 @@ and is between 256 and 4096 characters. It is defined in the file
earlyprintk= [X86,SH,BLACKFIN]
earlyprintk=vga
earlyprintk=serial[,ttySn[,baudrate]]
+ earlyprintk=ttySn[,baudrate]
earlyprintk=dbgp[debugController#]
Append ",keep" to not disable it when the real console