projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.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 140051e07fa64c7f07e2fd8b5e099ceaf15c3860..92213d2b7c110ef070edfdb14313e6fc2c9ad2cd 100644
(file)
--- a/
arch/x86_64/kernel/early_printk.c
+++ b/
arch/x86_64/kernel/early_printk.c
@@
-11,11
+11,10
@@
#ifdef __i386__
#include <asm/setup.h>
#ifdef __i386__
#include <asm/setup.h>
-#define VGABASE (__ISA_IO_base + 0xb8000)
#else
#include <asm/bootsetup.h>
#else
#include <asm/bootsetup.h>
-#define VGABASE ((void __iomem *)0xffffffff800b8000UL)
#endif
#endif
+#define VGABASE (__ISA_IO_base + 0xb8000)
static int max_ypos = 25, max_xpos = 80;
static int current_ypos = 25, current_xpos = 0;
static int max_ypos = 25, max_xpos = 80;
static int current_ypos = 25, current_xpos = 0;
@@
-176,7
+175,7
@@
static noinline long simnow(long cmd, long a, long b, long c)
return ret;
}
return ret;
}
-void __init simnow_init(char *str)
+
static
void __init simnow_init(char *str)
{
char *fn = "klog";
if (*str == '=')
{
char *fn = "klog";
if (*str == '=')
@@
-215,20
+214,16
@@
void early_printk(const char *fmt, ...)
static int __initdata keep_early;
static int __initdata keep_early;
-
int __init setup_early_printk(char *opt
)
+
static int __init setup_early_printk(char *buf
)
{
{
- char *space;
-
char buf[256]
;
+ if (!buf)
+
return 0
;
if (early_console_initialized)
if (early_console_initialized)
- return 1;
-
- strlcpy(buf,opt,sizeof(buf));
- space = strchr(buf, ' ');
- if (space)
- *space = 0;
+ return 0;
+ early_console_initialized = 1;
- if (strstr(buf,"keep"))
+ if (strstr(buf,
"keep"))
keep_early = 1;
if (!strncmp(buf, "serial", 6)) {
keep_early = 1;
if (!strncmp(buf, "serial", 6)) {
@@
-248,11
+243,12
@@
int __init setup_early_printk(char *opt)
early_console = &simnow_console;
keep_early = 1;
}
early_console = &simnow_console;
keep_early = 1;
}
- early_console_initialized = 1;
register_console(early_console);
return 0;
}
register_console(early_console);
return 0;
}
+early_param("earlyprintk", setup_early_printk);
+
void __init disable_early_printk(void)
{
if (!early_console_initialized || !early_console)
void __init disable_early_printk(void)
{
if (!early_console_initialized || !early_console)
@@
-266,4
+262,3
@@
void __init disable_early_printk(void)
}
}
}
}
-__setup("earlyprintk=", setup_early_printk);