Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f21c81 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

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: default avatarYinghai Lu <yinghai.lu@sun.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06b2a76d

init/main.c

+5 −9
Original line number Diff line number Diff line
@@ -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