Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / generic / setup.c

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 5526375010f8d952d465757b3f6de06bae338071..a13a08b8c9ec1c24ba9292fe377083f2f70c2e43 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -156,11 +156,23 @@ static struct txx9_board_vec *__init find_board_byname(const char *name)
 
 static void __init prom_init_cmdline(void)
 {
-       int argc = (int)fw_arg0;
-       int *argv32 = (int *)fw_arg1;
+       int argc;
+       int *argv32;
        int i;                  /* Always ignore the "-c" at argv[0] */
        char builtin[CL_SIZE];
 
+       if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) {
+               /*
+                * argc is not a valid number, or argv32 is not a valid
+                * pointer
+                */
+               argc = 0;
+               argv32 = NULL;
+       } else {
+               argc = (int)fw_arg0;
+               argv32 = (int *)fw_arg1;
+       }
+
        /* ignore all built-in args if any f/w args given */
        /*
         * But if built-in strings was started with '+', append them
@@ -414,10 +426,12 @@ char * __init prom_getcmdline(void)
 
 const char *__init prom_getenv(const char *name)
 {
-       const s32 *str = (const s32 *)fw_arg2;
+       const s32 *str;
 
-       if (!str)
+       if (fw_arg2 < CKSEG0)
                return NULL;
+
+       str = (const s32 *)fw_arg2;
        /* YAMON style ("name", "value" pairs) */
        while (str[0] && str[1]) {
                if (!strcmp((const char *)(unsigned long)str[0], name))
@@ -622,6 +636,21 @@ unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;
 EXPORT_SYMBOL(__swizzle_addr_b);
 #endif
 
+#ifdef NEEDS_TXX9_IOSWABW
+static u16 ioswabw_default(volatile u16 *a, u16 x)
+{
+       return le16_to_cpu(x);
+}
+static u16 __mem_ioswabw_default(volatile u16 *a, u16 x)
+{
+       return x;
+}
+u16 (*ioswabw)(volatile u16 *a, u16 x) = ioswabw_default;
+EXPORT_SYMBOL(ioswabw);
+u16 (*__mem_ioswabw)(volatile u16 *a, u16 x) = __mem_ioswabw_default;
+EXPORT_SYMBOL(__mem_ioswabw);
+#endif
+
 void __init txx9_physmap_flash_init(int no, unsigned long addr,
                                    unsigned long size,
                                    const struct physmap_flash_data *pdata)