6 files changed, 45 insertions, 78 deletions

diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 3871b65f0c82..920bb742b7a2 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -20,7 +20,7 @@
  * Stack layout in 'ret_from_system_call':
  *      ptrace needs to have all regs on the stack.
  *      if the order here is changed, it needs to be
- *      updated in fork.c:copy_process, signal.c:do_signal,
+ *      updated in fork.c:copy_thread, signal.c:do_signal,
  *      ptrace.c and ptrace.h
  *
  * M32Rx/M32R2                          M32R
@@ -41,18 +41,17 @@
  *       @(0x38,sp) - syscall_nr        ditto
  *       @(0x3c,sp) - acc0h             @(0x3c,sp) - acch
  *       @(0x40,sp) - acc0l             @(0x40,sp) - accl
- *       @(0x44,sp) - acc1h             @(0x44,sp) - psw
- *       @(0x48,sp) - acc1l             @(0x48,sp) - bpc
- *       @(0x4c,sp) - psw               @(0x4c,sp) - bbpsw
- *       @(0x50,sp) - bpc               @(0x50,sp) - bbpc
- *       @(0x54,sp) - bbpsw             @(0x54,sp) - spu (cr3)
- *       @(0x58,sp) - bbpc              @(0x58,sp) - fp (r13)
- *       @(0x5c,sp) - spu (cr3)         @(0x5c,sp) - lr (r14)
- *       @(0x60,sp) - fp (r13)          @(0x60,sp) - spi (cr12)
- *       @(0x64,sp) - lr (r14)          @(0x64,sp) - orig_r0
- *       @(0x68,sp) - spi (cr2)
- *       @(0x6c,sp) - orig_r0
- *
+ *       @(0x44,sp) - acc1h             @(0x44,sp) - dummy_acc1h
+ *       @(0x48,sp) - acc1l             @(0x48,sp) - dummy_acc1l
+ *       @(0x4c,sp) - psw               ditto
+ *       @(0x50,sp) - bpc               ditto
+ *       @(0x54,sp) - bbpsw             ditto
+ *       @(0x58,sp) - bbpc              ditto
+ *       @(0x5c,sp) - spu (cr3)         ditto
+ *       @(0x60,sp) - fp (r13)          ditto
+ *       @(0x64,sp) - lr (r14)          ditto
+ *       @(0x68,sp) - spi (cr2)         ditto
+ *       @(0x6c,sp) - orig_r0           ditto
  */
 
 #include <linux/config.h>
@@ -102,6 +101,12 @@
 #define ACC0L(reg)              @(0x40,reg)
 #define ACC1H(reg)              @(0x44,reg)
 #define ACC1L(reg)              @(0x48,reg)
+#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
+#define ACCH(reg)               @(0x3C,reg)
+#define ACCL(reg)               @(0x40,reg)
+#else
+#error unknown isa configuration
+#endif
 #define PSW(reg)                @(0x4C,reg)
 #define BPC(reg)                @(0x50,reg)
 #define BBPSW(reg)              @(0x54,reg)
@@ -111,21 +116,6 @@
 #define LR(reg)                 @(0x64,reg)
 #define SP(reg)                 @(0x68,reg)
 #define ORIG_R0(reg)            @(0x6C,reg)
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-#define ACCH(reg)               @(0x3C,reg)
-#define ACCL(reg)               @(0x40,reg)
-#define PSW(reg)                @(0x44,reg)
-#define BPC(reg)                @(0x48,reg)
-#define BBPSW(reg)              @(0x4C,reg)
-#define BBPC(reg)               @(0x50,reg)
-#define SPU(reg)                @(0x54,reg)
-#define FP(reg)                 @(0x58,reg)  /* FP = R13 */
-#define LR(reg)                 @(0x5C,reg)
-#define SP(reg)                 @(0x60,reg)
-#define ORIG_R0(reg)            @(0x64,reg)
-#else
-#error unknown isa configuration
-#endif
 
 CF_MASK         = 0x00000001
 TF_MASK         = 0x00000100
@@ -142,7 +132,7 @@ VM_MASK		= 0x00020000
 #endif
 
 ENTRY(ret_from_fork)
-        ld      r0, @sp+
+        pop     r0
         bl      schedule_tail
         GET_THREAD_INFO(r8)
         bra     syscall_exit
@@ -231,7 +221,7 @@ restore_all:
         RESTORE_ALL
 
         # perform work that needs to be done immediately before resumption
-        # r9 : frags
+        # r9 : flags
         ALIGN
 work_pending:
         and3    r4, r9, #_TIF_NEED_RESCHED
@@ -320,7 +310,7 @@ ENTRY(ei_handler)
 ;    GET_ICU_STATUS;
         seth    r0, #shigh(M32R_ICU_ISTS_ADDR)
         ld      r0, @(low(M32R_ICU_ISTS_ADDR),r0)
-        st      r0, @-sp
+        push    r0
 #if defined(CONFIG_SMP)
         /*
          * If IRQ == 0      --> Nothing to do,  Not write IMASK
@@ -557,7 +547,7 @@ check_end:
 #endif  /* CONFIG_PLAT_M32104UT */
         bl      do_IRQ
 #endif  /* CONFIG_SMP */
-        ld      r14, @sp+
+        pop     r14
         seth    r0, #shigh(M32R_ICU_IMASK_ADDR)
         st      r14, @(low(M32R_ICU_IMASK_ADDR),r0)
 #else
@@ -1015,4 +1005,3 @@ ENTRY(sys_call_table)
         .long sys_waitid
 
 syscall_table_size=(.-sys_call_table)
-
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c
index be8b711367ec..c50330fa83b9 100644
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
@@ -23,9 +23,6 @@ EXPORT_SYMBOL(boot_cpu_data);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(enable_irq);
-EXPORT_SYMBOL(disable_irq);
-EXPORT_SYMBOL(disable_irq_nosync);
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(__down);
 EXPORT_SYMBOL(__down_interruptible);
@@ -38,13 +35,6 @@ EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__delay);
 EXPORT_SYMBOL(__const_udelay);
 
-EXPORT_SYMBOL(__get_user_1);
-EXPORT_SYMBOL(__get_user_2);
-EXPORT_SYMBOL(__get_user_4);
-
-EXPORT_SYMBOL(strpbrk);
-EXPORT_SYMBOL(strstr);
-
 EXPORT_SYMBOL(strncpy_from_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(clear_user);
@@ -59,11 +49,8 @@ extern void *dcache_dummy;
 EXPORT_SYMBOL(dcache_dummy);
 #endif
 EXPORT_SYMBOL(cpu_data);
-EXPORT_SYMBOL(cpu_online_map);
-EXPORT_SYMBOL(cpu_callout_map);
 
 /* Global SMP stuff */
-EXPORT_SYMBOL(synchronize_irq);
 EXPORT_SYMBOL(smp_call_function);
 
 /* TLB flushing */
@@ -83,27 +70,11 @@ EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
 
 /* memory and string operations */
-EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(memcpy);
-/* EXPORT_SYMBOL(memcpy_fromio); // not implement yet */
-/* EXPORT_SYMBOL(memcpy_toio); // not implement yet */
 EXPORT_SYMBOL(memset);
-/* EXPORT_SYMBOL(memset_io); // not implement yet */
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(clear_page);
-
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strcmp);
-EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strncmp);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strncpy);
 
 EXPORT_SYMBOL(_inb);
 EXPORT_SYMBOL(_inw);
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 5dfc7ea45cf7..065f5e719058 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -116,6 +116,10 @@ void cpu_idle (void)
 
 void machine_restart(char *__unused)
 {
+#if defined(CONFIG_PLAT_MAPPI3)
+        outw(1, (unsigned long)PLD_REBOOT);
+#endif
+
         printk("Please push reset button!\n");
         while (1)
                 cpu_relax();
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 0d78942b4c76..3cd3c2988a48 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -9,6 +9,7 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
@@ -219,8 +220,6 @@ static unsigned long __init setup_memory(void)
 extern unsigned long setup_memory(void);
 #endif  /* CONFIG_DISCONTIGMEM */
 
-#define M32R_PCC_PCATCR 0x00ef7014      /* will move to m32r.h */
-
 void __init setup_arch(char **cmdline_p)
 {
         ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
@@ -269,15 +268,14 @@ void __init setup_arch(char **cmdline_p)
         paging_init();
 }
 
-static struct cpu cpu[NR_CPUS];
+static struct cpu cpu_devices[NR_CPUS];
 
 static int __init topology_init(void)
 {
-        int cpu_id;
+        int i;
 
-        for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
-                if (cpu_possible(cpu_id))
-                        register_cpu(&cpu[cpu_id], cpu_id, NULL);
+        for_each_present_cpu(i)
+                register_cpu(&cpu_devices[i], i, NULL);
 
         return 0;
 }
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index cb33097fefc4..6498ee70bb73 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -118,6 +118,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
 #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
         COPY(acch);
         COPY(accl);
+        COPY(dummy_acc1h);
+        COPY(dummy_acc1l);
 #else
 #error unknown isa configuration
 #endif
@@ -203,6 +205,8 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
         COPY(acch);
         COPY(accl);
+        COPY(dummy_acc1h);
+        COPY(dummy_acc1l);
 #else
 #error unknown isa configuration
 #endif
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index d7ec16e7fb25..840b4348bf0c 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -39,8 +39,10 @@
  *              Martin J. Bligh :       Added support for multi-quad systems
  */
 
+#include <linux/module.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/irq.h>
@@ -72,11 +74,15 @@ physid_mask_t phys_cpu_present_map;
 
 /* Bitmask of currently online CPUs */
 cpumask_t cpu_online_map;
+EXPORT_SYMBOL(cpu_online_map);
 
 cpumask_t cpu_bootout_map;
 cpumask_t cpu_bootin_map;
-cpumask_t cpu_callout_map;
 static cpumask_t cpu_callin_map;
+cpumask_t cpu_callout_map;
+EXPORT_SYMBOL(cpu_callout_map);
+cpumask_t cpu_possible_map = CPU_MASK_ALL;
+EXPORT_SYMBOL(cpu_possible_map);
 
 /* Per CPU bogomips and other parameters */
 struct cpuinfo_m32r cpu_data[NR_CPUS] __cacheline_aligned;
@@ -110,7 +116,6 @@ static unsigned int calibration_result;
 
 void smp_prepare_boot_cpu(void);
 void smp_prepare_cpus(unsigned int);
-static void smp_tune_scheduling(void);
 static void init_ipi_lock(void);
 static void do_boot_cpu(int);
 int __cpu_up(unsigned int);
@@ -177,6 +182,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
         for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
                 physid_set(phys_id, phys_cpu_present_map);
+#ifndef CONFIG_HOTPLUG_CPU
+        cpu_present_map = cpu_possible_map;
+#endif
 
         show_mp_info(nr_cpu);
 
@@ -186,7 +194,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
          * Setup boot CPU information
          */
         smp_store_cpu_info(0); /* Final full version of the data */
-        smp_tune_scheduling();
 
         /*
          * If SMP should be disabled, then really disable it!
@@ -230,11 +237,6 @@ smp_done:
         Dprintk("Boot done.\n");
 }
 
-static void __init smp_tune_scheduling(void)
-{
-        /* Nothing to do. */
-}
-
 /*
  * init_ipi_lock : Initialize IPI locks.
  */
@@ -629,4 +631,3 @@ static void __init unmap_cpu_to_physid(int cpu_id, int phys_id)
         physid_2_cpu[phys_id] = -1;
         cpu_2_physid[cpu_id] = -1;
 }
-