linux-mips
[Top] [All Lists]

[PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH resend] MIPS: more replace CL_SIZE by COMMAND_LINE_SIZE
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Tue, 8 Dec 2009 17:24:44 +0900
Cc: yuasa@linux-mips.org, linux-mips@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:from:to:cc :subject:message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=dHDDc/7z2Aame5bdsWdPYbhgDBPEuJ9cIUhpgXM06yE=; b=a5erPesJ5Q2gLz6/c1Orhj2kdViC8SRPR+BiKUmjFC/gcWirj4gfA4MEHJV6ljkZBX W9AWy8aaxY52wuV6yZAIqP4wUq4RI6poeG7iSGIAUc/I9NT2E600LlWHeqsZpkwxXAEg LKC/7grRvTTvkJNCjWPDciwhhaJkzfICr4zts=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; b=UNoSlut25XQqP6/qB8mt6pZ23apC5RFyic7un4AohmIGhCS11VSZs6uLmbM+Uq+8SO yAOScrDFJ9wD//ZHDtnXaRu42QQ/4BLWCNGV1+0Dp0nIWjOCFdmZ2vVNDKDCadKUZkRo JX82DYxWdgAF7ZpLLItbeqhbjyWOh2HVDSHFA=
In-reply-to: <20091208165844.ddd9106f.yuasa@linux-mips.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20091208165844.ddd9106f.yuasa@linux-mips.org>
Sender: linux-mips-bounce@linux-mips.org
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


<Prev in Thread] Current Thread [Next in Thread>