Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
  sh: remove extraneous ; on scif_sercon_putc wait loop
  sh: Add missing dma_sync_single_range_for_*().
  sh: panic on machvec section misalignment.
  sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata().

3 files changed, 9 insertions, 1 deletions

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: {