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

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

[PATCH] Dynamic kernel command-line: ia64 



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

[akpm@osdl.org: move some declarations to the right place]
Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e498b66

arch/ia64/kernel/efi.c

+3 −2
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ efi_map_pal_code (void) 
	ia64_srlz_i();

}



extern char __initdata boot_command_line[];



void __init

efi_init (void)

{
@@ -413,11 +415,10 @@ efi_init (void) 
	efi_char16_t *c16;

	u64 efi_desc_size;

	char *cp, vendor[100] = "unknown";

	extern char saved_command_line[];

	int i;



	/* it's too early to be able to use the standard kernel command line support... */

	for (cp = saved_command_line; *cp; ) {

	for (cp = boot_command_line; *cp; ) {

		if (memcmp(cp, "mem=", 4) == 0) {

			mem_limit = memparse(cp + 4, &cp);

		} else if (memcmp(cp, "max_addr=", 9) == 0) {

arch/ia64/kernel/sal.c

+3 −2
Original line number Diff line number Diff line
@@ -190,13 +190,14 @@ sal_desc_ap_wakeup (void *p) 
	}

}



extern char __initdata boot_command_line[];



static void __init

chk_nointroute_opt(void)

{

	char *cp;

	extern char saved_command_line[];



	for (cp = saved_command_line; *cp; ) {

	for (cp = boot_command_line; *cp; ) {

		if (memcmp(cp, "nointroute", 10) == 0) {

			no_int_routing = 1;

			printk ("no_int_routing on\n");

arch/ia64/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ reserve_memory (void) 
	 * appropriate after a kernel panic.

	 */

	{

		char *from = strstr(saved_command_line, "crashkernel=");

		char *from = strstr(boot_command_line, "crashkernel=");

		unsigned long base, size;

		if (from) {

			size = memparse(from + 12, &from);
@@ -463,7 +463,7 @@ setup_arch (char **cmdline_p) 
	ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);



	*cmdline_p = __va(ia64_boot_param->command_line);

	strlcpy(saved_command_line, *cmdline_p, COMMAND_LINE_SIZE);

	strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);



	efi_init();

	io_port_init();