Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
  [MIPS] tlbex.c: Cleanup __init usage.
  [MIPS] WRPPMC serial support move to platform device
  [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
  [MIPS] VPE: reimplement ELF loader.
  [MIPS] cleanup WRPPMC include files
  [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
  [MIPS] SMP: Use ISO C struct initializer for local structs.
  [MIPS] SMP: Kill useless casts.
  [MIPS] Kill num_online_cpus() loops.
  [MIPS] SMP: Implement smp_call_function_mask().
  [MIPS] Make facility to convert CPU types to strings generally available.
  [MIPS] Convert list of CPU types from #define to enum.
  [MIPS] Optimize get_unaligned / put_unaligned implementations.
  [MIPS] checkfiles: Fix "need space after that ','" errors.
  [MIPS] Fix "no space between function name and open parenthesis" warnings.
  [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
  [MIPS] tlbex: Size optimize code by declaring a few functions inline.
  [MIPS] pg-r4k.c: Dump the generated code
  [MIPS] Cobalt: Remove cobalt_machine_power_off()
  [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
  ...

1 files changed, 108 insertions, 0 deletions

diff --git a/arch/mips/fw/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
new file mode 100644
index 000000000000..fd604ef28823
--- /dev/null
+++ b/arch/mips/fw/arc/cmdline.c
@@ -0,0 +1,108 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * cmdline.c: Kernel command line creation using ARCS argc/argv.
+ *
+ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+#include <asm/sgialib.h>
+#include <asm/bootinfo.h>
+
+#undef DEBUG_CMDLINE
+
+char * __init prom_getcmdline(void)
+{
+        return arcs_cmdline;
+}
+
+static char *ignored[] = {
+        "ConsoleIn=",
+        "ConsoleOut=",
+        "SystemPartition=",
+        "OSLoader=",
+        "OSLoadPartition=",
+        "OSLoadFilename=",
+        "OSLoadOptions="
+};
+
+static char *used_arc[][2] = {
+        { "OSLoadPartition=", "root=" },
+        { "OSLoadOptions=", "" }
+};
+
+static char * __init move_firmware_args(char* cp)
+{
+        char *s;
+        int actr, i;
+
+        actr = 1; /* Always ignore argv[0] */
+
+        while (actr < prom_argc) {
+                for(i = 0; i < ARRAY_SIZE(used_arc); i++) {
+                        int len = strlen(used_arc[i][0]);
+
+                        if (!strncmp(prom_argv(actr), used_arc[i][0], len)) {
+                        /* Ok, we want it. First append the replacement... */
+                                strcat(cp, used_arc[i][1]);
+                                cp += strlen(used_arc[i][1]);
+                                /* ... and now the argument */
+                                s = strstr(prom_argv(actr), "=");
+                                if (s) {
+                                        s++;
+                                        strcpy(cp, s);
+                                        cp += strlen(s);
+                                }
+                                *cp++ = ' ';
+                                break;
+                        }
+                }
+                actr++;
+        }
+
+        return cp;
+}
+
+void __init prom_init_cmdline(void)
+{
+        char *cp;
+        int actr, i;
+
+        actr = 1; /* Always ignore argv[0] */
+
+        cp = arcs_cmdline;
+        /*
+         * Move ARC variables to the beginning to make sure they can be
+         * overridden by later arguments.
+         */
+        cp = move_firmware_args(cp);
+
+        while (actr < prom_argc) {
+                for (i = 0; i < ARRAY_SIZE(ignored); i++) {
+                        int len = strlen(ignored[i]);
+
+                        if (!strncmp(prom_argv(actr), ignored[i], len))
+                                goto pic_cont;
+                }
+                /* Ok, we want it. */
+                strcpy(cp, prom_argv(actr));
+                cp += strlen(prom_argv(actr));
+                *cp++ = ' ';
+
+        pic_cont:
+                actr++;
+        }
+
+        if (cp != arcs_cmdline)         /* get rid of trailing space */
+                --cp;
+        *cp = '\0';
+
+#ifdef DEBUG_CMDLINE
+        printk(KERN_DEBUG "prom cmdline: %s\n", arcs_cmdline);
+#endif
+}