aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-02-08 04:21:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:22:42 -0800
commitf6f21c81464ce52dbeec921bdc2e8b288c491920 (patch)
tree926a0fdcf513218bcbfc6f021e03edc36cff58fa /init/main.c
parent06b2a76d25d3cfbd14680021c1d356c91be6904e (diff)
downloadmrst-s0i3-test-f6f21c81464ce52dbeec921bdc2e8b288c491920.tar.gz
mrst-s0i3-test-f6f21c81464ce52dbeec921bdc2e8b288c491920.tar.xz
mrst-s0i3-test-f6f21c81464ce52dbeec921bdc2e8b288c491920.zip
Convert loglevel-related kernel boot parameters to early_param
So we can use them for the early console like console=uart8250 or earlycon=uart8250 or early_printk Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/init/main.c b/init/main.c
index ed9747f00ec..c59859b85db 100644
--- a/init/main.c
+++ b/init/main.c
@@ -238,22 +238,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
static int __init debug_kernel(char *str)
{
- if (*str)
- return 0;
console_loglevel = 10;
- return 1;
+ return 0;
}
static int __init quiet_kernel(char *str)
{
- if (*str)
- return 0;
console_loglevel = 4;
- return 1;
+ return 0;
}
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
static int __init loglevel(char *str)
{
@@ -261,7 +257,7 @@ static int __init loglevel(char *str)
return 1;
}
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
/*
* Unknown boot options get handed to init, unless they look like