6 files changed, 9 insertions, 9 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 224f4bc9925e..9b0979f4df7a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1,5 +1,6 @@
 config SUPERH
         def_bool y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select EXPERT
         select CLKDEV_LOOKUP
         select HAVE_IDE if HAS_IOPORT
@@ -711,7 +712,6 @@ config CC_STACKPROTECTOR
 config SMP
         bool "Symmetric multi-processing support"
         depends on SYS_SUPPORTS_SMP
-        select USE_GENERIC_SMP_HELPERS
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 1fa8be409771..122f737a901f 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -15,6 +15,7 @@
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
+#include <linux/mfd/tmio.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index 21c5088788da..b9d9489a5012 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -81,7 +81,7 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)
 
                 /*
                  * Fix version; Note that we avoid version #0
-                 * to distingush NO_CONTEXT.
+                 * to distinguish NO_CONTEXT.
                  */
                 if (!asid)
                         asid = MMU_CONTEXT_FIRST_VERSION;
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index 8c00785c60d5..a33673b3687d 100644
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -47,7 +47,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
         if (!pg)
                 return NULL;
         page = virt_to_page(pg);
-        pgtable_page_ctor(page);
+        if (!pgtable_page_ctor(page)) {
+                quicklist_free(QUICK_PT, NULL, pg);
+                return NULL;
+        }
         return page;
 }
 
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h
index 45a93669289d..ad27ffa65e2e 100644
--- a/arch/sh/include/asm/thread_info.h
+++ b/arch/sh/include/asm/thread_info.h
@@ -41,8 +41,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #if defined(CONFIG_4KSTACKS)
 #define THREAD_SHIFT    12
 #else
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index 9b6e4beeb296..ca46834294b7 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -108,7 +108,7 @@ need_resched:
         and     #(0xf0>>1), r0          ! interrupts off (exception path)?
         cmp/eq  #(0xf0>>1), r0
         bt      noresched
-        mov.l   3f, r0
+        mov.l   1f, r0
         jsr     @r0                     ! call preempt_schedule_irq
          nop
         bra     need_resched
@@ -119,9 +119,7 @@ noresched:
          nop
 
         .align 2
-1:      .long   PREEMPT_ACTIVE
-2:      .long   schedule
-3:      .long   preempt_schedule_irq
+1:      .long   preempt_schedule_irq
 #endif
 
 ENTRY(resume_userspace)