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

Commit 3e47d147 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Remove powerpc specific cmd_line 



There is no need for yet another copy of the command line, just
use boot_command_line like everyone else.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c7d1f6af

arch/powerpc/include/asm/machdep.h

+0 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ extern struct machdep_calls *machine_id; 


extern void probe_machine(void);



extern char cmd_line[COMMAND_LINE_SIZE];



#ifdef CONFIG_PPC_PMAC

/*

 * Power macintoshes have either a CUDA, PMU or SMU controlling

arch/powerpc/kernel/prom.c

+1 −3
Original line number Diff line number Diff line
@@ -668,14 +668,12 @@ void __init early_init_devtree(void *params) 
	 * device-tree, including the platform type, initrd location and

	 * size, TCE reserve, and more ...

	 */

	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);

	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line);



	/* Scan memory nodes and rebuild MEMBLOCKs */

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);



	/* Save command line for /proc/cmdline and then parse parameters */

	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);

	parse_early_param();



	/* make sure we've parsed cmdline for mem= before this */

arch/powerpc/kernel/setup-common.c

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ EXPORT_SYMBOL_GPL(boot_cpuid); 


unsigned long klimit = (unsigned long) _end;



char cmd_line[COMMAND_LINE_SIZE];



/*

 * This still seems to be needed... -- paulus

 */

arch/powerpc/kernel/setup_32.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void __init exc_lvl_early_init(void) 
/* Warning, IO base is not yet inited */

void __init setup_arch(char **cmdline_p)

{

	*cmdline_p = cmd_line;

	*cmdline_p = boot_command_line;



	/* so udelay does something sensible, assume <= 1000 bogomips */

	loops_per_jiffy = 500000000 / HZ;

arch/powerpc/kernel/setup_64.c

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

	ppc64_boot_msg(0x12, "Setup Arch");



	*cmdline_p = cmd_line;

	*cmdline_p = boot_command_line;



	/*

	 * Set cache line size based on type of cpu as a default.