summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-08-29 18:12:24 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-09-21 10:18:14 -0700
commit83d9f65bdae6f6b34d75282c6618d3f50846849a (patch)
tree07c6385742694ca9cbccf471ad0cb1d0b434e6d0 /arch/x86/boot
parentb30a3f6257ed2105259b404d419b4964e363928c (diff)
downloadop-kernel-dev-83d9f65bdae6f6b34d75282c6618d3f50846849a.zip
op-kernel-dev-83d9f65bdae6f6b34d75282c6618d3f50846849a.tar.gz
x86, setup: Fix earlyprintk=serial,ttyS0,115200
Torsten reported that there is garbage output, after commit 8fee13a48e4879fba57725f6d9513df4bfa8e9f3 (x86, setup: enable early console output from the decompressor) It turns out we missed the offset for that case. Reported-by: Torsten Kaiser <just.for.lkml@googlemail.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <4C7B0578.8090807@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/early_serial_console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c
index 030f4b9..407a8e2 100644
--- a/arch/x86/boot/early_serial_console.c
+++ b/arch/x86/boot/early_serial_console.c
@@ -58,7 +58,7 @@ static void parse_earlyprintk(void)
if (arg[pos] == ',')
pos++;
- if (!strncmp(arg, "ttyS", 4)) {
+ if (!strncmp(arg + pos, "ttyS", 4)) {
static const int bases[] = { 0x3f8, 0x2f8 };
int idx = 0;
OpenPOWER on IntegriCloud