diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:39 -0500 |
commit | bf71cecbe4282fbb8ec035a7199fa4aca64db54c (patch) | |
tree | bd6508f19731c024ef459d88338bfff39b63a099 | |
parent | b8757b21f7628c57cb20e55be324fdef283a56e9 (diff) |
[PATCH] Dynamic kernel command-line: ppc
Rename saved_command_line into boot_command_line.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/ppc/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/lopec.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/pplus.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/prep_setup.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 3c506af19880..c79704f5409c 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -543,7 +543,7 @@ void __init setup_arch(char **cmdline_p) | |||
543 | init_mm.brk = (unsigned long) klimit; | 543 | init_mm.brk = (unsigned long) klimit; |
544 | 544 | ||
545 | /* Save unparsed command line copy for /proc/cmdline */ | 545 | /* Save unparsed command line copy for /proc/cmdline */ |
546 | strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); | 546 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); |
547 | *cmdline_p = cmd_line; | 547 | *cmdline_p = cmd_line; |
548 | 548 | ||
549 | parse_early_param(); | 549 | parse_early_param(); |
diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c index 18dc6e8dd4f4..b947c774f524 100644 --- a/arch/ppc/platforms/lopec.c +++ b/arch/ppc/platforms/lopec.c | |||
@@ -344,7 +344,7 @@ lopec_setup_arch(void) | |||
344 | if (bootargs != NULL) { | 344 | if (bootargs != NULL) { |
345 | strcpy(cmd_line, bootargs); | 345 | strcpy(cmd_line, bootargs); |
346 | /* again.. */ | 346 | /* again.. */ |
347 | strcpy(saved_command_line, cmd_line); | 347 | strcpy(boot_command_line, cmd_line); |
348 | } | 348 | } |
349 | } | 349 | } |
350 | #endif | 350 | #endif |
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 9778105d4dfe..8a1788c48155 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
@@ -592,7 +592,7 @@ static void __init pplus_setup_arch(void) | |||
592 | if (bootargs != NULL) { | 592 | if (bootargs != NULL) { |
593 | strcpy(cmd_line, bootargs); | 593 | strcpy(cmd_line, bootargs); |
594 | /* again.. */ | 594 | /* again.. */ |
595 | strcpy(saved_command_line, cmd_line); | 595 | strcpy(boot_command_line, cmd_line); |
596 | } | 596 | } |
597 | } | 597 | } |
598 | #endif | 598 | #endif |
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c index 1cb75a1f825e..f166299571d6 100644 --- a/arch/ppc/platforms/prep_setup.c +++ b/arch/ppc/platforms/prep_setup.c | |||
@@ -634,7 +634,7 @@ static void __init prep_init_sound(void) | |||
634 | /* | 634 | /* |
635 | * Find a way to push these informations to the cs4232 driver | 635 | * Find a way to push these informations to the cs4232 driver |
636 | * Give it out with printk, when not in cmd_line? | 636 | * Give it out with printk, when not in cmd_line? |
637 | * Append it to cmd_line and saved_command_line? | 637 | * Append it to cmd_line and boot_command_line? |
638 | * Format is cs4232=io,irq,dma,dma2 | 638 | * Format is cs4232=io,irq,dma,dma2 |
639 | */ | 639 | */ |
640 | } | 640 | } |
@@ -897,7 +897,7 @@ prep_setup_arch(void) | |||
897 | if (bootargs != NULL) { | 897 | if (bootargs != NULL) { |
898 | strcpy(cmd_line, bootargs); | 898 | strcpy(cmd_line, bootargs); |
899 | /* again.. */ | 899 | /* again.. */ |
900 | strcpy(saved_command_line, cmd_line); | 900 | strcpy(boot_command_line, cmd_line); |
901 | } | 901 | } |
902 | } | 902 | } |
903 | 903 | ||