diff options
| author | Anton Blanchard | 2014-09-17 06:39:36 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2014-10-02 09:33:55 +0200 |
| commit | 3e47d1474c2b4099f0fadd12a6553fdb2e8feaae (patch) | |
| tree | 8d7dee7104d3198cc7ca3d2789a0e0b8846f83ca /arch/powerpc/platforms | |
| parent | powerpc: Use pr_fmt in module loader code (diff) | |
| download | kernel-qcow2-linux-3e47d1474c2b4099f0fadd12a6553fdb2e8feaae.tar.gz kernel-qcow2-linux-3e47d1474c2b4099f0fadd12a6553fdb2e8feaae.tar.xz kernel-qcow2-linux-3e47d1474c2b4099f0fadd12a6553fdb2e8feaae.zip | |
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: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 7044fd36197b..5b77b1919fd2 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -258,7 +258,7 @@ static void chrp_init_early(void) struct device_node *node; const char *property; - if (strstr(cmd_line, "console=")) + if (strstr(boot_command_line, "console=")) return; /* find the boot console from /chosen/stdout */ if (!of_chosen) diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 141f8899a633..b127a29ac526 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -336,7 +336,7 @@ static void __init pmac_setup_arch(void) #endif #ifdef CONFIG_ADB - if (strstr(cmd_line, "adb_sync")) { + if (strstr(boot_command_line, "adb_sync")) { extern int __adb_probe_sync; __adb_probe_sync = 1; } @@ -460,7 +460,7 @@ pmac_halt(void) static void __init pmac_init_early(void) { /* Enable early btext debug if requested */ - if (strstr(cmd_line, "btextdbg")) { + if (strstr(boot_command_line, "btextdbg")) { udbg_adb_init_early(); register_early_udbg_console(); } @@ -469,8 +469,8 @@ static void __init pmac_init_early(void) pmac_feature_init(); /* Initialize debug stuff */ - udbg_scc_init(!!strstr(cmd_line, "sccdbg")); - udbg_adb_init(!!strstr(cmd_line, "btextdbg")); + udbg_scc_init(!!strstr(boot_command_line, "sccdbg")); + udbg_adb_init(!!strstr(boot_command_line, "btextdbg")); #ifdef CONFIG_PPC64 iommu_init_early_dart(); |