5 files changed, 15 insertions, 3 deletions

diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index d8e122971c3e..0d12a124055c 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -149,8 +149,7 @@ call_dpf:
          lds    r10, pr
         rts
          nop
-0:      sti
-        mov.l   3f, r0
+0:      mov.l   3f, r0
         mov     r9, r6
         mov     r8, r5
         jmp     @r0
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 9833493d8867..80b637c30203 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -76,7 +76,7 @@ static void scif_sercon_putc(int c)
         sci_in(&scif_port, SCxSR);
         sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40));
 
-        while ((sci_in(&scif_port, SCxSR) & 0x40) == 0);
+        while ((sci_in(&scif_port, SCxSR) & 0x40) == 0)
                 ;
 
         if (c == '\n')
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 23c5948f0124..129b2cfd18a8 100644
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -91,6 +91,13 @@ void __init sh_mv_setup(void)
                                 (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.
                  */
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 891d1d46c902..f64a2d2416d4 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -93,6 +93,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         case PTRACE_PEEKTEXT: /* read word at location addr. */
         case PTRACE_PEEKDATA:
                 ret = generic_ptrace_peekdata(child, addr, data);
+                break;
 
         /* read the word at location addr in the USER area. */
         case PTRACE_PEEKUSR: {
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 502d43e4785c..67015044d74a 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -854,9 +854,14 @@ void __init trap_init(void)
         set_exception_table_evt(0x800, do_reserved_inst);
         set_exception_table_evt(0x820, do_illegal_slot_inst);
 #elif defined(CONFIG_SH_FPU)
+#ifdef CONFIG_CPU_SUBTYPE_SHX3
+        set_exception_table_evt(0xd80, do_fpu_state_restore);
+        set_exception_table_evt(0xda0, do_fpu_state_restore);
+#else
         set_exception_table_evt(0x800, do_fpu_state_restore);
         set_exception_table_evt(0x820, do_fpu_state_restore);
 #endif
+#endif
 
 #ifdef CONFIG_CPU_SH2
         set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_handler);