git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
early_printk.c
diff --git
a/arch/x86_64/kernel/early_printk.c
b/arch/x86_64/kernel/early_printk.c
index
600ec81
..
e3a19e8
100644
(file)
--- a/
arch/x86_64/kernel/early_printk.c
+++ b/
arch/x86_64/kernel/early_printk.c
@@
-10,7
+10,7
@@
#ifdef __i386__
#define VGABASE (__ISA_IO_base + 0xb8000)
#else
#ifdef __i386__
#define VGABASE (__ISA_IO_base + 0xb8000)
#else
-#define VGABASE
0xffffffff800b8000UL
+#define VGABASE
((void __iomem *)0xffffffff800b8000UL)
#endif
#define MAX_YPOS 25
#endif
#define MAX_YPOS 25
@@
-60,7
+60,7
@@
static struct console early_vga_console = {
/* Serial functions loosely based on a similar package from Klaus P. Gerlicher */
/* Serial functions loosely based on a similar package from Klaus P. Gerlicher */
-int early_serial_base = 0x3f8; /* ttyS0 */
+static int early_serial_base = 0x3f8; /* ttyS0 */
#define XMTRDY 0x20
#define XMTRDY 0x20
@@
-198,9
+198,6
@@
int __init setup_early_printk(char *opt)
early_console = &early_serial_console;
} else if (!strncmp(buf, "vga", 3)) {
early_console = &early_vga_console;
early_console = &early_serial_console;
} else if (!strncmp(buf, "vga", 3)) {
early_console = &early_vga_console;
- } else {
- early_console = NULL;
- return -1;
}
early_console_initialized = 1;
register_console(early_console);
}
early_console_initialized = 1;
register_console(early_console);