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

Commit 9c00f761 authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds
Browse files

[PATCH] Dynamic kernel command-line: frv 



1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87e1f9c6

arch/frv/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ unsigned long __initdata num_mappedpages; 


struct cpuinfo_frv __nongprelbss boot_cpu_data;



char command_line[COMMAND_LINE_SIZE];

char __initdata command_line[COMMAND_LINE_SIZE];

char __initdata redboot_command_line[COMMAND_LINE_SIZE];



#ifdef CONFIG_PM
@@ -762,7 +762,7 @@ void __init setup_arch(char **cmdline_p) 
	printk("uClinux FR-V port done by Red Hat Inc <dhowells@redhat.com>\n");

#endif



	memcpy(saved_command_line, redboot_command_line, COMMAND_LINE_SIZE);

	memcpy(boot_command_line, redboot_command_line, COMMAND_LINE_SIZE);



	determine_cpu();

	determine_clocks(1);
@@ -803,7 +803,7 @@ void __init setup_arch(char **cmdline_p) 
#endif



	/* deal with the command line - RedBoot may have passed one to the kernel */

	memcpy(command_line, saved_command_line, sizeof(command_line));

	memcpy(command_line, boot_command_line, sizeof(command_line));

	*cmdline_p = &command_line[0];

	parse_cmdline_early(command_line);