Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 5906/1: arm: change command_line to cmd_line

drivers/of/fdt expects a cmd_line symbol, while arm uses command_line.
Change to the former, so that we can eventually share with the fdt
code.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Jeremy Kerr and committed by
Russell King
48ab7e09 c5113b61

+4 -4
+4 -4
arch/arm/kernel/setup.c
··· 118 118 119 119 static const char *cpu_name; 120 120 static const char *machine_name; 121 - static char __initdata command_line[COMMAND_LINE_SIZE]; 121 + static char __initdata cmd_line[COMMAND_LINE_SIZE]; 122 122 123 123 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; 124 124 static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } }; ··· 707 707 /* parse_early_param needs a boot_command_line */ 708 708 strlcpy(boot_command_line, from, COMMAND_LINE_SIZE); 709 709 710 - /* populate command_line too for later use, preserving boot_command_line */ 711 - strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); 712 - *cmdline_p = command_line; 710 + /* populate cmd_line too for later use, preserving boot_command_line */ 711 + strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE); 712 + *cmdline_p = cmd_line; 713 713 714 714 parse_early_param(); 715 715