Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / machvec.c

diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 1e78191154e335bd5f5b03ba48cc951fff9ac253..129b2cfd18a84db251d5791e17bb7c4360f869ae 100644 (file)
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -29,12 +29,14 @@ static struct sh_machine_vector * __init get_mv_byname(const char *name)
        struct sh_machine_vector *mv;
 
        for_each_mv(mv)
-               if (strcasecmp(name, get_system_type()) == 0)
+               if (strcasecmp(name, mv->mv_name) == 0)
                        return mv;
 
        return NULL;
 }
 
+static unsigned int __initdata machvec_selected;
+
 static int __init early_parse_mv(char *from)
 {
        char mv_name[MV_NAME_SIZE] = "";
@@ -55,26 +57,56 @@ static int __init early_parse_mv(char *from)
        mv_name[mv_len] = '\0';
        from = mv_end;
 
-       if (strcmp(sh_mv.mv_name, mv_name) != 0) {
-               mvp = get_mv_byname(mv_name);
-               if (unlikely(!mvp)) {
-                       printk("Available vectors:\n\n\t");
-                       for_each_mv(mvp)
-                               printk("'%s', ", mvp->mv_name);
-                       printk("\n\n");
-                       panic("Failed to select machvec '%s' -- halting.\n",
-                             mv_name);
-               } else
-                       sh_mv = *mvp;
-       }
+       machvec_selected = 1;
+
+       /* Boot with the generic vector */
+       if (strcmp(mv_name, "generic") == 0)
+               return 0;
+
+       mvp = get_mv_byname(mv_name);
+       if (unlikely(!mvp)) {
+               printk("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
+               for_each_mv(mvp)
+                       printk("'%s', ", mvp->mv_name);
+               printk("\n\n");
+               panic("Failed to select machvec '%s' -- halting.\n",
+                     mv_name);
+       } else
+               sh_mv = *mvp;
 
-       printk(KERN_NOTICE "Booting machvec: %s\n", sh_mv.mv_name);
        return 0;
 }
 early_param("sh_mv", early_parse_mv);
 
 void __init sh_mv_setup(void)
 {
+       /*
+        * Only overload the machvec if one hasn't been selected on
+        * the command line with sh_mv=
+        */
+       if (!machvec_selected) {
+               unsigned long machvec_size;
+
+               machvec_size = ((unsigned long)&__machvec_end -
+                               (unsigned long)&__machvec_start);
+
+               /*
+                * Sanity check for machvec section alignment. Ensure
+                * __initmv hasn't been misused.
+                */
+               if (machvec_size % sizeof(struct sh_machine_vector))
+                       panic("machvec misaligned, invalid __initmv use?");
+
+               /*
+                * If the machvec hasn't been preselected, use the first
+                * vector (usually the only one) from .machvec.init.
+                */
+               if (machvec_size >= sizeof(struct sh_machine_vector))
+                       sh_mv = *(struct sh_machine_vector *)&__machvec_start;
+       }
+
+       printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type());
+
        /*
         * Manually walk the vec, fill in anything that the board hasn't yet
         * by hand, wrapping to the generic implementation.