diff options
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 06e801c7e25..e27809b6d04 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
| @@ -160,7 +160,6 @@ static void __init prom_init_cmdline(void) | |||
| 160 | int argc; | 160 | int argc; |
| 161 | int *argv32; | 161 | int *argv32; |
| 162 | int i; /* Always ignore the "-c" at argv[0] */ | 162 | int i; /* Always ignore the "-c" at argv[0] */ |
| 163 | static char builtin[COMMAND_LINE_SIZE] __initdata; | ||
| 164 | 163 | ||
| 165 | if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) { | 164 | if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) { |
| 166 | /* | 165 | /* |
| @@ -174,20 +173,6 @@ static void __init prom_init_cmdline(void) | |||
| 174 | argv32 = (int *)fw_arg1; | 173 | argv32 = (int *)fw_arg1; |
| 175 | } | 174 | } |
| 176 | 175 | ||
| 177 | /* ignore all built-in args if any f/w args given */ | ||
| 178 | /* | ||
| 179 | * But if built-in strings was started with '+', append them | ||
| 180 | * to command line args. If built-in was started with '-', | ||
| 181 | * ignore all f/w args. | ||
| 182 | */ | ||
| 183 | builtin[0] = '\0'; | ||
| 184 | if (arcs_cmdline[0] == '+') | ||
| 185 | strcpy(builtin, arcs_cmdline + 1); | ||
| 186 | else if (arcs_cmdline[0] == '-') { | ||
| 187 | strcpy(builtin, arcs_cmdline + 1); | ||
| 188 | argc = 0; | ||
| 189 | } else if (argc <= 1) | ||
| 190 | strcpy(builtin, arcs_cmdline); | ||
| 191 | arcs_cmdline[0] = '\0'; | 176 | arcs_cmdline[0] = '\0'; |
| 192 | 177 | ||
| 193 | for (i = 1; i < argc; i++) { | 178 | for (i = 1; i < argc; i++) { |
| @@ -201,12 +186,6 @@ static void __init prom_init_cmdline(void) | |||
| 201 | } else | 186 | } else |
| 202 | strcat(arcs_cmdline, str); | 187 | strcat(arcs_cmdline, str); |
| 203 | } | 188 | } |
| 204 | /* append saved builtin args */ | ||
| 205 | if (builtin[0]) { | ||
| 206 | if (arcs_cmdline[0]) | ||
| 207 | strcat(arcs_cmdline, " "); | ||
| 208 | strcat(arcs_cmdline, builtin); | ||
| 209 | } | ||
| 210 | } | 189 | } |
| 211 | 190 | ||
| 212 | static int txx9_ic_disable __initdata; | 191 | static int txx9_ic_disable __initdata; |
