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

Commit 2a2d5924 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] i386/x86-64: make setup_early_printk() usage consistent 



The explicit and implicit calls to setup_early_printk() were passing
inconsistent arguments.

Signed-Off-By: default avatarJan Beulich <jbeulich@novell.com>

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4092bdeb

arch/i386/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1584,7 +1584,7 @@ void __init setup_arch(char **cmdline_p) 
		if (s) {

		if (s) {

			extern void setup_early_printk(char *);

			extern void setup_early_printk(char *);





			setup_early_printk(s);

			setup_early_printk(strchr(s, '=') + 1);

			printk("early console enabled\n");

			printk("early console enabled\n");

		}

		}

	}

	}

arch/x86_64/kernel/early_printk.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ void early_printk(const char *fmt, ...) 
	va_end(ap); 

	va_end(ap); 

} 

} 





static int keep_early; 

static int __initdata keep_early;





int __init setup_early_printk(char *opt) 

int __init setup_early_printk(char *opt) 

{  

{
@@ -226,8 +226,6 @@ int __init setup_early_printk(char *opt) 
	if (early_console_initialized)

	if (early_console_initialized)

		return -1;

		return -1;





	opt = strchr(opt, '=') + 1;



	strlcpy(buf,opt,sizeof(buf)); 

	strlcpy(buf,opt,sizeof(buf)); 

	space = strchr(buf, ' '); 

	space = strchr(buf, ' '); 

	if (space)

	if (space)

arch/x86_64/kernel/head64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ void __init x86_64_start_kernel(char * real_mode_data) 
#endif

#endif

	s = strstr(saved_command_line, "earlyprintk=");

	s = strstr(saved_command_line, "earlyprintk=");

	if (s != NULL)

	if (s != NULL)

		setup_early_printk(s);

		setup_early_printk(strchr(s, '=') + 1);

#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

	s = strstr(saved_command_line, "numa=");

	s = strstr(saved_command_line, "numa=");

	if (s != NULL)

	if (s != NULL)