Messages in this thread Patch in this message | | | Date | Tue, 21 Sep 2010 19:58:06 GMT | From | tip-bot for Yinghai Lu <> | Subject | [tip:x86/urgent] x86, setup: Fix earlyprintk=serial,ttyS0,115200 |
| |
Commit-ID: 83d9f65bdae6f6b34d75282c6618d3f50846849a Gitweb: http://git.kernel.org/tip/83d9f65bdae6f6b34d75282c6618d3f50846849a Author: Yinghai Lu <yinghai@kernel.org> AuthorDate: Sun, 29 Aug 2010 18:12:24 -0700 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Tue, 21 Sep 2010 10:18:14 -0700
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> --- arch/x86/boot/early_serial_console.c | 2 +- 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;
| |