[PATCH] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[PATCH] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Yoichi Yuasa]

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/powertv/asic/asic_devices.c |    4 ++--
 arch/mips/powertv/memory.c            |    2 +-
 arch/mips/rb532/prom.c                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index 5f20cee..bae8288 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -187,7 +187,7 @@ static void __init fs_update(int pe, int md, int sdiv, int disable_div_by_3)
 /*
  * Allow override of bootloader-specified model
  */
-static char __initdata cmdline[CL_SIZE];
+static char __initdata cmdline[COMMAND_LINE_SIZE];
 
 #define	FORCEFAMILY_PARAM	"forcefamily"
 
@@ -199,7 +199,7 @@ static __init int check_forcefamily(unsigned char forced_family[2])
 	forced_family[1] = '\0';
 
 	/* Check the command line for a forcefamily directive */
-	strncpy(cmdline, arcs_cmdline, CL_SIZE - 1);
+	strncpy(cmdline, arcs_cmdline, COMMAND_LINE_SIZE - 1);
 	p = strstr(cmdline, FORCEFAMILY_PARAM);
 	if (p && (p != cmdline) && (*(p - 1) != ' '))
 		p = strstr(p, " " FORCEFAMILY_PARAM "=");
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c
index c63620a..28d0660 100644
--- a/arch/mips/powertv/memory.c
+++ b/arch/mips/powertv/memory.c
@@ -44,7 +44,7 @@
 
 unsigned long ptv_memsize;
 
-char __initdata cmdline[CL_SIZE];
+char __initdata cmdline[COMMAND_LINE_SIZE];
 
 void __init prom_meminit(void)
 {
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index f4f3f2e..13f350c 100644
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -69,7 +69,7 @@ static inline unsigned long tag2ul(char *arg, const char *tag)
 
 void __init prom_setup_cmdline(void)
 {
-	static char cmd_line[CL_SIZE] __initdata;
+	static char cmd_line[COMMAND_LINE_SIZE] __initdata;
 	char *cp, *board;
 	int prom_argc;
 	char **prom_argv, **prom_envp;
-- 
1.6.5.4

[PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Yoichi Yuasa]

Sorry, I forgot one more CL_SIZE.

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/powertv/asic/asic_devices.c |    4 ++--
 arch/mips/powertv/cmdline.c           |    2 +-
 arch/mips/powertv/memory.c            |    2 +-
 arch/mips/rb532/prom.c                |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index 5f20cee..bae8288 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -187,7 +187,7 @@ static void __init fs_update(int pe, int md, int sdiv, int disable_div_by_3)
 /*
  * Allow override of bootloader-specified model
  */
-static char __initdata cmdline[CL_SIZE];
+static char __initdata cmdline[COMMAND_LINE_SIZE];
 
 #define	FORCEFAMILY_PARAM	"forcefamily"
 
@@ -199,7 +199,7 @@ static __init int check_forcefamily(unsigned char forced_family[2])
 	forced_family[1] = '\0';
 
 	/* Check the command line for a forcefamily directive */
-	strncpy(cmdline, arcs_cmdline, CL_SIZE - 1);
+	strncpy(cmdline, arcs_cmdline, COMMAND_LINE_SIZE - 1);
 	p = strstr(cmdline, FORCEFAMILY_PARAM);
 	if (p && (p != cmdline) && (*(p - 1) != ' '))
 		p = strstr(p, " " FORCEFAMILY_PARAM "=");
diff --git a/arch/mips/powertv/cmdline.c b/arch/mips/powertv/cmdline.c
index 3bc4334..98d73cb 100644
--- a/arch/mips/powertv/cmdline.c
+++ b/arch/mips/powertv/cmdline.c
@@ -48,5 +48,5 @@ void  __init prom_init_cmdline(void)
 	arcs_cmdline[len] = ' ';
 
 	strlcpy(arcs_cmdline + len + 1, (char *)_prom_argv,
-		CL_SIZE - len - 1);
+		COMMAND_LINE_SIZE - len - 1);
 }
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c
index c63620a..28d0660 100644
--- a/arch/mips/powertv/memory.c
+++ b/arch/mips/powertv/memory.c
@@ -44,7 +44,7 @@
 
 unsigned long ptv_memsize;
 
-char __initdata cmdline[CL_SIZE];
+char __initdata cmdline[COMMAND_LINE_SIZE];
 
 void __init prom_meminit(void)
 {
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index f4f3f2e..13f350c 100644
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -69,7 +69,7 @@ static inline unsigned long tag2ul(char *arg, const char *tag)
 
 void __init prom_setup_cmdline(void)
 {
-	static char cmd_line[CL_SIZE] __initdata;
+	static char cmd_line[COMMAND_LINE_SIZE] __initdata;
 	char *cp, *board;
 	int prom_argc;
 	char **prom_argv, **prom_envp;
-- 
1.6.5.4

Re: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Sergei Shtylyov]

Hello.

Yoichi Yuasa wrote:
> Sorry, I forgot one more CL_SIZE.
>   

   You should put such notes under the --- tearline, not into the patch 
description.

> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> ---

WBR, Sergei

Re: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Ralf Baechle]

On Tue, Dec 08, 2009 at 05:24:44PM +0900, Yoichi Yuasa wrote:

> Sorry, I forgot one more CL_SIZE.
> 
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>

I fixed these in the pull tree for Linus a few days ago along with a few
other issues and I was planning to get these fixes into the main tree
indirectly by just pulling from Linus.

Thanks!

  Ralf

Re: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Yoichi Yuasa]

Hi Sergei,

On Tue, 08 Dec 2009 14:34:11 +0300
Sergei Shtylyov <sshtylyov@ru.mvista.com> wrote:

> Hello.
> 
> Yoichi Yuasa wrote:
> > Sorry, I forgot one more CL_SIZE.
> >   
> 
>    You should put such notes under the --- tearline, not into the patch 
> description.

I'll be careful.

Thanks,
Yoichi

Re: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Maciej W. Rozycki]

On Tue, 8 Dec 2009, Ralf Baechle wrote:

> > Sorry, I forgot one more CL_SIZE.
> > 
> > Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> 
> I fixed these in the pull tree for Linus a few days ago along with a few
> other issues and I was planning to get these fixes into the main tree
> indirectly by just pulling from Linus.

 Hmm, why do I have a feeling of deja vu?...  Must be this:

http://www.linux-mips.org/git?p=linux.git;a=commitdiff;h=97b7ae4257ef7ba8ed9b7944a4f56a49af3e8abb

  Maciej

Re: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

[Ralf Baechle]

On Sat, Dec 12, 2009 at 11:55:47PM +0000, Maciej W. Rozycki wrote:

> > > Sorry, I forgot one more CL_SIZE.
> > > 
> > > Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> > 
> > I fixed these in the pull tree for Linus a few days ago along with a few
> > other issues and I was planning to get these fixes into the main tree
> > indirectly by just pulling from Linus.
> 
>  Hmm, why do I have a feeling of deja vu?...  Must be this:
> 
> http://www.linux-mips.org/git?p=linux.git;a=commitdiff;h=97b7ae4257ef7ba8ed9b7944a4f56a49af3e8abb

Good memory - this time CL_SIZE is dead for good!

  Ralf