* [PATCH] x86, setup: move out serial_putchar out of putchar
@ 2010-08-29 22:59 Yinghai Lu
0 siblings, 0 replies; only message in thread
From: Yinghai Lu @ 2010-08-29 22:59 UTC (permalink / raw)
To: H. Peter Anvin, Ingo Molnar, Thomas Gleixner; +Cc: linux-kernel
let puts to call serial_putchar directly.
So only need to check early_serial_base per string.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/boot/tty.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
Index: linux-2.6/arch/x86/boot/tty.c
===================================================================
--- linux-2.6.orig/arch/x86/boot/tty.c
+++ linux-2.6/arch/x86/boot/tty.c
@@ -52,16 +52,22 @@ static void __attribute__((section(".ini
void __attribute__((section(".inittext"))) putchar(int ch)
{
if (ch == '\n')
- putchar('\r'); /* \n -> \r\n */
+ bios_putchar('\r'); /* \n -> \r\n */
bios_putchar(ch);
-
- if (early_serial_base != 0)
- serial_putchar(ch);
}
void __attribute__((section(".inittext"))) puts(const char *str)
{
+ if (early_serial_base) {
+ const char *s = str;
+ while (*s) {
+ if (*s == '\n')
+ serial_putchar('\r');
+ serial_putchar(*s++);
+ }
+ }
+
while (*str)
putchar(*str++);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-29 23:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-29 22:59 [PATCH] x86, setup: move out serial_putchar out of putchar Yinghai Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome