Skip to contentSkip to conversation

MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

PATCH Superseded Yoichi Yuasa 4 participants 7 messages Dec 8, 2009 – Dec 19, 2009 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

---
 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(-)
arch/mips/powertv/asic/asic_devices.c +2 -2
index 5f20cee..bae8288 100644
@@ -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 "=");
arch/mips/powertv/memory.c +1 -1
index c63620a..28d0660 100644
@@ -44,7 +44,7 @@
 
 unsigned long ptv_memsize;
 
-char __initdata cmdline[CL_SIZE];
+char __initdata cmdline[COMMAND_LINE_SIZE];
 
 void __init prom_meminit(void)
 {
arch/mips/rb532/prom.c +1 -1
index f4f3f2e..13f350c 100644
@@ -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;
Signature · 1 line
1.6.5.4
#1 lore raw

PATCH RESEND 1/1 MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

Sorry, I forgot one more CL_SIZE.

---
 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(-)
arch/mips/powertv/asic/asic_devices.c +2 -2
index 5f20cee..bae8288 100644
@@ -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 "=");
arch/mips/powertv/cmdline.c +1 -1
index 3bc4334..98d73cb 100644
@@ -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);
 }
arch/mips/powertv/memory.c +1 -1
index c63620a..28d0660 100644
@@ -44,7 +44,7 @@
 
 unsigned long ptv_memsize;
 
-char __initdata cmdline[CL_SIZE];
+char __initdata cmdline[COMMAND_LINE_SIZE];
 
 void __init prom_meminit(void)
 {
arch/mips/rb532/prom.c +1 -1
index f4f3f2e..13f350c 100644
@@ -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;
Signature · 1 line
1.6.5.4
#3 lore raw

Hi Sergei,

Quoted 8 lines · On Tue, 08 Dec 2009 14:34:11 +0300 Sergei Shtylyov <[email protected]>…

Hello.

Quoted 2 lines · Yoichi Yuasa

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

#5 lore raw
Quoted 7 lines · Ralf Baechle
Quoted 3 lines

Sorry, I forgot one more CL_SIZE.

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

#6 lore raw
Quoted 11 lines · Maciej W. Rozycki
Quoted 7 lines
Quoted 3 lines

Sorry, I forgot one more CL_SIZE.

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