projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[powerpc.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
140051e
..
e22ecd5
100644
(file)
--- a/
arch/x86_64/kernel/early_printk.c
+++ b/
arch/x86_64/kernel/early_printk.c
@@
-215,20
+215,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 (
!strcmp
(buf,"keep"))
keep_early = 1;
if (!strncmp(buf, "serial", 6)) {
keep_early = 1;
if (!strncmp(buf, "serial", 6)) {
@@
-248,11
+244,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
+263,3
@@
void __init disable_early_printk(void)
}
}
}
}
-__setup("earlyprintk=", setup_early_printk);