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

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

[PATCH] Dynamic kernel command-line: ppc 



Rename saved_command_line into boot_command_line.

Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8757b21

arch/ppc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ void __init setup_arch(char **cmdline_p) 
	init_mm.brk = (unsigned long) klimit;



	/* Save unparsed command line copy for /proc/cmdline */

	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);

	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);

	*cmdline_p = cmd_line;



	parse_early_param();

arch/ppc/platforms/lopec.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ lopec_setup_arch(void) 
		 if (bootargs != NULL) {

			 strcpy(cmd_line, bootargs);

			 /* again.. */

			 strcpy(saved_command_line, cmd_line);

			 strcpy(boot_command_line, cmd_line);

		}

	}

#endif

arch/ppc/platforms/pplus.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static void __init pplus_setup_arch(void) 
		if (bootargs != NULL) {

			strcpy(cmd_line, bootargs);

			/* again.. */

			strcpy(saved_command_line, cmd_line);

			strcpy(boot_command_line, cmd_line);

		}

	}

#endif

arch/ppc/platforms/prep_setup.c

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static void __init prep_init_sound(void) 
	/*

	 * Find a way to push these informations to the cs4232 driver

	 * Give it out with printk, when not in cmd_line?

	 * Append it to  cmd_line and saved_command_line?

	 * Append it to  cmd_line and boot_command_line?

	 * Format is cs4232=io,irq,dma,dma2

	 */

}
@@ -897,7 +897,7 @@ prep_setup_arch(void) 
		 if (bootargs != NULL) {

			 strcpy(cmd_line, bootargs);

			 /* again.. */

			 strcpy(saved_command_line, cmd_line);

			 strcpy(boot_command_line, cmd_line);

		}

	}