8 files changed, 68 insertions, 87 deletions

diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c
index de45c6a3e33b..79baa47af977 100644
--- a/arch/sh/kernel/cpu/irq/intc-sh5.c
+++ b/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -242,6 +242,7 @@ void __init plat_irq_setup(void)
                                 reg += 8;
                         }
                 }
+        }
 #endif
 
         /*
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 566ce79b9abf..a0470f2f5479 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -16,6 +16,21 @@
 
 static struct plat_sci_port sci_platform_data[] = {
         {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 80, 80, 80 },
+        },{
+                .mapbase        = 0xffe10000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 81, 81, 81, 81 },
+        },{
+                .mapbase        = 0xffe20000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 82, 82, 82, 82 },
+        },{
                 .mapbase        = 0xa4e30000,
                 .flags          = UPF_BOOT_AUTOCONF,
                 .type           = PORT_SCI,
@@ -73,9 +88,35 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
+static struct resource sh7723_usb_host_resources[] = {
+        [0] = {
+                .name   = "r8a66597_hcd",
+                .start  = 0xa4d80000,
+                .end    = 0xa4d800ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 65,
+                .end    = 65,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sh7723_usb_host_device = {
+        .name           = "r8a66597_hcd",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(sh7723_usb_host_resources),
+        .resource       = sh7723_usb_host_resources,
+};
+
 static struct platform_device *sh7723_devices[] __initdata = {
         &sci_device,
         &rtc_device,
+        &sh7723_usb_host_device,
 };
 
 static int __init sh7723_devices_setup(void)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index ae2b22219f02..f189a559462b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -291,8 +291,9 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors,
-                         NULL, NULL, irq_mask_registers, irq_prio_registers,
-                         irq_sense_registers);
+                        NULL, irq_mask_registers, irq_prio_registers,
+                        irq_sense_registers);
+
 
 /* External interrupt pins in IRL mode */
 static struct intc_vect irl_vectors[] __initdata = {
@@ -324,10 +325,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors,
-                         NULL, NULL, irl7654_mask_registers, NULL, NULL);
+                        NULL, irl7654_mask_registers, NULL, NULL);
 
 static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors,
-                         NULL, NULL, irl3210_mask_registers, NULL, NULL);
+                        NULL, irl3210_mask_registers, NULL, NULL);
 
 #define INTC_ICR0       0xffd00000
 #define INTC_INTMSK0    0xffd00044
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c
index b3d0a03b4c76..5482e65375a9 100644
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@@ -30,6 +30,7 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <asm/unaligned.h>
 
 void *module_alloc(unsigned long size)
 {
@@ -56,34 +57,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
         return 0;
 }
 
-#ifdef CONFIG_SUPERH32
-#define COPY_UNALIGNED_WORD(sw, tw, align) \
-{ \
-        void *__s = &(sw), *__t = &(tw); \
-        unsigned short *__s2 = __s, *__t2 = __t; \
-        unsigned char *__s1 = __s, *__t1 = __t; \
-        switch ((align)) \
-        { \
-        case 0: \
-                *(unsigned long *) __t = *(unsigned long *) __s; \
-                break; \
-        case 2: \
-                *__t2++ = *__s2++; \
-                *__t2 = *__s2; \
-                break; \
-        default: \
-                *__t1++ = *__s1++; \
-                *__t1++ = *__s1++; \
-                *__t1++ = *__s1++; \
-                *__t1 = *__s1; \
-                break; \
-        } \
-}
-#else
-/* One thing SHmedia doesn't screw up! */
-#define COPY_UNALIGNED_WORD(sw, tw, align)      { (tw) = (sw); }
-#endif
-
 int apply_relocate_add(Elf32_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
@@ -96,7 +69,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
         Elf32_Addr relocation;
         uint32_t *location;
         uint32_t value;
-        int align;
 
         pr_debug("Applying relocate section %u to %u\n", relsec,
                  sechdrs[relsec].sh_info);
@@ -109,7 +81,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
                         + ELF32_R_SYM(rel[i].r_info);
                 relocation = sym->st_value + rel[i].r_addend;
-                align = (int)location & 3;
 
 #ifdef CONFIG_SUPERH64
                 /* For text addresses, bit2 of the st_other field indicates
@@ -122,15 +93,15 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
 
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
                 case R_SH_DIR32:
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        value = get_unaligned(location);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        put_unaligned(value, location);
                         break;
                 case R_SH_REL32:
                         relocation = (relocation - (Elf32_Addr) location);
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        value = get_unaligned(location);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        put_unaligned(value, location);
                         break;
                 case R_SH_IMM_LOW16:
                         *location = (*location & ~0x3fffc00) |
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 5d039d168f57..60c50841143e 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -36,13 +36,6 @@ EXPORT_SYMBOL(cpu_possible_map);
 cpumask_t cpu_online_map;
 EXPORT_SYMBOL(cpu_online_map);
 
-static atomic_t cpus_booted = ATOMIC_INIT(0);
-
-/*
- * Run specified function on a particular processor.
- */
-void __smp_call_function(unsigned int cpu);
-
 static inline void __init smp_store_cpu_info(unsigned int cpu)
 {
         struct sh_cpuinfo *c = cpu_data + cpu;
@@ -175,45 +168,20 @@ static void stop_this_cpu(void *unused)
 
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, 0, 1, 0);
+        smp_call_function(stop_this_cpu, 0, 0);
 }
 
-struct smp_fn_call_struct smp_fn_call = {
-        .lock           = __SPIN_LOCK_UNLOCKED(smp_fn_call.lock),
-        .finished       = ATOMIC_INIT(0),
-};
-
-/*
- * The caller of this wants the passed function to run on every cpu.  If wait
- * is set, wait until all cpus have finished the function before returning.
- * The lock is here to protect the call structure.
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int smp_call_function(void (*func)(void *info), void *info, int retry, int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        unsigned int nr_cpus = atomic_read(&cpus_booted);
-        int i;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        spin_lock(&smp_fn_call.lock);
-
-        atomic_set(&smp_fn_call.finished, 0);
-        smp_fn_call.fn = func;
-        smp_fn_call.data = info;
-
-        for (i = 0; i < nr_cpus; i++)
-                if (i != smp_processor_id())
-                        plat_send_ipi(i, SMP_MSG_FUNCTION);
-
-        if (wait)
-                while (atomic_read(&smp_fn_call.finished) != (nr_cpus - 1));
+        int cpu;
 
-        spin_unlock(&smp_fn_call.lock);
+        for_each_cpu_mask(cpu, mask)
+                plat_send_ipi(cpu, SMP_MSG_FUNCTION);
+}
 
-        return 0;
+void arch_send_call_function_single_ipi(int cpu)
+{
+        plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE);
 }
 
 /* Not really SMP stuff ... */
@@ -229,7 +197,7 @@ static void flush_tlb_all_ipi(void *info)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(flush_tlb_all_ipi, 0, 1, 1);
+        on_each_cpu(flush_tlb_all_ipi, 0, 1);
 }
 
 static void flush_tlb_mm_ipi(void *mm)
@@ -255,7 +223,7 @@ void flush_tlb_mm(struct mm_struct *mm)
         preempt_disable();
 
         if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
-                smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1, 1);
+                smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -292,7 +260,7 @@ void flush_tlb_range(struct vm_area_struct *vma,
                 fd.vma = vma;
                 fd.addr1 = start;
                 fd.addr2 = end;
-                smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1, 1);
+                smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -316,7 +284,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 
         fd.addr1 = start;
         fd.addr2 = end;
-        on_each_cpu(flush_tlb_kernel_range_ipi, (void *)&fd, 1, 1);
+        on_each_cpu(flush_tlb_kernel_range_ipi, (void *)&fd, 1);
 }
 
 static void flush_tlb_page_ipi(void *info)
@@ -335,7 +303,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 
                 fd.vma = vma;
                 fd.addr1 = page;
-                smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1, 1);
+                smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -359,6 +327,6 @@ void flush_tlb_one(unsigned long asid, unsigned long vaddr)
         fd.addr1 = asid;
         fd.addr2 = vaddr;
 
-        smp_call_function(flush_tlb_one_ipi, (void *)&fd, 1, 1);
+        smp_call_function(flush_tlb_one_ipi, (void *)&fd, 1);
         local_flush_tlb_one(asid, vaddr);
 }
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c
index d41e561be20e..1b2ae35c4a76 100644
--- a/arch/sh/kernel/stacktrace.c
+++ b/arch/sh/kernel/stacktrace.c
@@ -34,3 +34,4 @@ void save_stack_trace(struct stack_trace *trace)
                 }
         }
 }
+EXPORT_SYMBOL_GPL(save_stack_trace);
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index c7113786ecd4..7b4b82bd1156 100644
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -44,7 +44,6 @@ SECTIONS
 
         _etext = .;                     /* End of text section */
 
-        BUG_TABLE
         NOTES
         RO_DATA(PAGE_SIZE)
 
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
index d1e177009a41..33fa46451406 100644
--- a/arch/sh/kernel/vmlinux_64.lds.S
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -65,7 +65,6 @@ SECTIONS
 
         _etext = .;                     /* End of text section */
 
-        BUG_TABLE
         NOTES 
         RO_DATA(PAGE_SIZE)