3 files changed, 12 insertions, 8 deletions

diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index ebc73b85094a..1c3b99642e1c 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -75,11 +75,7 @@ static int __init cf_init_default(void)
 #if defined(CONFIG_CPU_SH4)
         allocate_cf_area();
 #endif
-#if defined(CONFIG_SH_UNKNOWN)
-        /* This should be done in each board's init_xxx_irq. */
-        make_imask_irq(14);
-        disable_irq(14);
-#endif
+
         return 0;
 }
 
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index e8121de5faa4..23c5948f0124 100644
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -35,6 +35,8 @@ static struct sh_machine_vector * __init get_mv_byname(const char *name)
         return NULL;
 }
 
+static unsigned int __initdata machvec_selected;
+
 static int __init early_parse_mv(char *from)
 {
         char mv_name[MV_NAME_SIZE] = "";
@@ -55,9 +57,15 @@ static int __init early_parse_mv(char *from)
         mv_name[mv_len] = '\0';
         from = mv_end;
 
+        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");
+                printk("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
                 for_each_mv(mvp)
                         printk("'%s', ", mvp->mv_name);
                 printk("\n\n");
@@ -76,7 +84,7 @@ void __init sh_mv_setup(void)
          * Only overload the machvec if one hasn't been selected on
          * the command line with sh_mv=
          */
-        if (strcmp(sh_mv.mv_name, "Unknown") != 0) {
+        if (!machvec_selected) {
                 unsigned long machvec_size;
 
                 machvec_size = ((unsigned long)&__machvec_end -
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 55ed653c7a67..6f1ea9b33374 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -47,7 +47,7 @@ struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
  * The machine vector. First entry in .machvec.init, or clobbered by
  * sh_mv= on the command line, prior to .machvec.init teardown.
  */
-struct sh_machine_vector sh_mv = { .mv_name = "Unknown", };
+struct sh_machine_vector sh_mv = { .mv_name = "generic", };
 
 #ifdef CONFIG_VT
 struct screen_info screen_info;