Patched in Tegra support.

16 files changed, 253 insertions, 75 deletions

diff --git a/arch/h8300/kernel/Makefile b/arch/h8300/kernel/Makefile
index 1cc57f872d3..8d4d2a54be9 100644
--- a/arch/h8300/kernel/Makefile
+++ b/arch/h8300/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := vmlinux.lds
 
 obj-y := process.o traps.o ptrace.o irq.o \
          sys_h8300.o time.o signal.o \
-         setup.o gpio.o syscalls.o \
+         setup.o gpio.o init_task.o syscalls.o \
          entry.o timer/
 
 obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o 
diff --git a/arch/h8300/kernel/entry.S b/arch/h8300/kernel/entry.S
index 617a6878787..ca743169030 100644
--- a/arch/h8300/kernel/entry.S
+++ b/arch/h8300/kernel/entry.S
@@ -158,7 +158,6 @@ INTERRUPTS = 128
 .globl SYMBOL_NAME(system_call)
 .globl SYMBOL_NAME(ret_from_exception)
 .globl SYMBOL_NAME(ret_from_fork)
-.globl SYMBOL_NAME(ret_from_kernel_thread)
 .globl SYMBOL_NAME(ret_from_interrupt)
 .globl SYMBOL_NAME(interrupt_redirect_table)
 .globl SYMBOL_NAME(sw_ksp),SYMBOL_NAME(sw_usp)
@@ -331,14 +330,6 @@ SYMBOL_NAME_LABEL(ret_from_fork)
         jsr     @SYMBOL_NAME(schedule_tail)
         jmp     @SYMBOL_NAME(ret_from_exception)
 
-SYMBOL_NAME_LABEL(ret_from_kernel_thread)
-        mov.l   er2,er0
-        jsr     @SYMBOL_NAME(schedule_tail)
-        mov.l   @(LER4:16,sp),er0
-        mov.l   @(LER5:16,sp),er1
-        jsr     @er1
-        jmp     @SYMBOL_NAME(ret_from_exception)
-
 SYMBOL_NAME_LABEL(resume)
         /*
          * Beware - when entering resume, offset of tss is in d1,
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c
index 53d7c0e4bd8..6866bd9c7fb 100644
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -33,6 +33,7 @@ EXPORT_SYMBOL(strncmp);
 
 EXPORT_SYMBOL(ip_fast_csum);
 
+EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
 
diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index 2fa8ac7b79b..1f67fed476a 100644
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -16,6 +16,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 
+#include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/io.h>
 #include <asm/setup.h>
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index b609f63f159..933bd388efb 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -36,9 +36,9 @@
 #include <linux/reboot.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/rcupdate.h>
 
 #include <asm/uaccess.h>
+#include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/setup.h>
 #include <asm/pgtable.h>
@@ -47,7 +47,6 @@ void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
 asmlinkage void ret_from_fork(void);
-asmlinkage void ret_from_kernel_thread(void);
 
 /*
  * The idle loop on an H8/300..
@@ -80,11 +79,11 @@ void (*idle)(void) = default_idle;
 void cpu_idle(void)
 {
         while (1) {
-                rcu_idle_enter();
                 while (!need_resched())
                         idle();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
+                preempt_enable_no_resched();
+                schedule();
+                preempt_disable();
         }
 }
 
@@ -123,34 +122,113 @@ void show_regs(struct pt_regs * regs)
                 printk("\n");
 }
 
+/*
+ * Create a kernel thread
+ */
+int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+{
+        long retval;
+        long clone_arg;
+        mm_segment_t fs;
+
+        fs = get_fs();
+        set_fs (KERNEL_DS);
+        clone_arg = flags | CLONE_VM;
+        __asm__("mov.l sp,er3\n\t"
+                "sub.l er2,er2\n\t"
+                "mov.l %2,er1\n\t"
+                "mov.l %1,er0\n\t"
+                "trapa #0\n\t"
+                "cmp.l sp,er3\n\t"
+                "beq 1f\n\t"
+                "mov.l %4,er0\n\t"
+                "mov.l %3,er1\n\t"
+                "jsr @er1\n\t"
+                "mov.l %5,er0\n\t"
+                "trapa #0\n"
+                "1:\n\t"
+                "mov.l er0,%0"
+                :"=r"(retval)
+                :"i"(__NR_clone),"g"(clone_arg),"g"(fn),"g"(arg),"i"(__NR_exit)
+                :"er0","er1","er2","er3");
+        set_fs (fs);
+        return retval;
+}
+
 void flush_thread(void)
 {
 }
 
+/*
+ * "h8300_fork()".. By the time we get here, the
+ * non-volatile registers have also been saved on the
+ * stack. We do some ugly pointer stuff here.. (see
+ * also copy_thread)
+ */
+
+asmlinkage int h8300_fork(struct pt_regs *regs)
+{
+        return -EINVAL;
+}
+
+asmlinkage int h8300_vfork(struct pt_regs *regs)
+{
+        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(), regs, 0, NULL, NULL);
+}
+
+asmlinkage int h8300_clone(struct pt_regs *regs)
+{
+        unsigned long clone_flags;
+        unsigned long newsp;
+
+        /* syscall2 puts clone_flags in er1 and usp in er2 */
+        clone_flags = regs->er1;
+        newsp = regs->er2;
+        if (!newsp)
+                newsp  = rdusp();
+        return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
+
+}
+
 int copy_thread(unsigned long clone_flags,
                 unsigned long usp, unsigned long topstk,
-                 struct task_struct * p)
+                 struct task_struct * p, struct pt_regs * regs)
 {
         struct pt_regs * childregs;
 
         childregs = (struct pt_regs *) (THREAD_SIZE + task_stack_page(p)) - 1;
 
-        if (unlikely(p->flags & PF_KTHREAD)) {
-                memset(childregs, 0, sizeof(struct pt_regs));
-                childregs->retpc = (unsigned long) ret_from_kernel_thread;
-                childregs->er4 = topstk; /* arg */
-                childregs->er5 = usp; /* fn */
-                p->thread.ksp = (unsigned long)childregs;
-        }
-        *childregs = *current_pt_regs();
+        *childregs = *regs;
         childregs->retpc = (unsigned long) ret_from_fork;
         childregs->er0 = 0;
-        p->thread.usp = usp ?: rdusp();
+
+        p->thread.usp = usp;
         p->thread.ksp = (unsigned long)childregs;
 
         return 0;
 }
 
+/*
+ * sys_execve() executes a new program.
+ */
+asmlinkage int sys_execve(const char *name,
+                          const char *const *argv,
+                          const char *const *envp,
+                          int dummy, ...)
+{
+        int error;
+        char * filename;
+        struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4);
+
+        filename = getname(name);
+        error = PTR_ERR(filename);
+        if (IS_ERR(filename))
+                return error;
+        error = do_execve(filename, argv, envp, regs);
+        putname(filename);
+        return error;
+}
+
 unsigned long thread_saved_pc(struct task_struct *tsk)
 {
         return ((struct pt_regs *)tsk->thread.esp0)->pc;
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
index 748cf6585aa..497fa89b5df 100644
--- a/arch/h8300/kernel/ptrace.c
+++ b/arch/h8300/kernel/ptrace.c
@@ -27,6 +27,7 @@
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/signal.h>
 
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index d0b1607f271..68d651081bd 100644
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -35,7 +35,6 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
-#include <asm/sections.h>
 
 #if defined(__H8300H__)
 #define CPU "H8/300H"
@@ -55,6 +54,7 @@ unsigned long memory_end;
 
 char __initdata command_line[COMMAND_LINE_SIZE];
 
+extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
 extern int _ramstart, _ramend;
 extern char _target_name[];
 extern void h8300_gpio_init(void);
@@ -119,9 +119,9 @@ void __init setup_arch(char **cmdline_p)
             memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; 
 #endif
 
-        init_mm.start_code = (unsigned long) _stext;
-        init_mm.end_code = (unsigned long) _etext;
-        init_mm.end_data = (unsigned long) _edata;
+        init_mm.start_code = (unsigned long) &_stext;
+        init_mm.end_code = (unsigned long) &_etext;
+        init_mm.end_data = (unsigned long) &_edata;
         init_mm.brk = (unsigned long) 0; 
 
 #if (defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)) && defined(CONFIG_GDB_MAGICPRINT)
@@ -134,12 +134,15 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_INFO "H8/300 series support by Yoshinori Sato <ysato@users.sourceforge.jp>\n");
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p "
-                "BSS=0x%p-0x%p\n", _stext, _etext, _sdata, _edata, __bss_start,
-                __bss_stop);
-        printk(KERN_DEBUG "KERNEL -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx "
-                "STACK=0x%06lx-0x%p\n", __bss_stop, memory_start, memory_start,
-                memory_end, memory_end, &_ramend);
+        printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x "
+                "BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext,
+                (int) &_sdata, (int) &_edata,
+                (int) &_sbss, (int) &_ebss);
+        printk(KERN_DEBUG "KERNEL -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x "
+                "STACK=0x%06x-0x%06x\n",
+               (int) &_ebss, (int) memory_start,
+                (int) memory_start, (int) memory_end,
+                (int) memory_end, (int) &_ramend);
 #endif
 
 #ifdef CONFIG_DEFAULT_CMDLINE
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index 0e81b96c642..af842c369d2 100644
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -38,6 +38,7 @@
 #include <linux/personality.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
+#include <linux/freezer.h>
 #include <linux/tracehook.h>
 
 #include <asm/setup.h>
@@ -46,15 +47,62 @@
 #include <asm/traps.h>
 #include <asm/ucontext.h>
 
+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+
+asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
+
 /*
  * Atomically swap in the new signal mask, and wait for a signal.
  */
+asmlinkage int do_sigsuspend(struct pt_regs *regs)
+{
+        old_sigset_t mask = regs->er3;
+        sigset_t saveset;
+
+        mask &= _BLOCKABLE;
+        spin_lock_irq(&current->sighand->siglock);
+        saveset = current->blocked;
+        siginitset(&current->blocked, mask);
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+
+        regs->er0 = -EINTR;
+        while (1) {
+                current->state = TASK_INTERRUPTIBLE;
+                schedule();
+                if (do_signal(regs, &saveset))
+                        return -EINTR;
+        }
+}
+
 asmlinkage int
-sys_sigsuspend(int unused1, int unused2, old_sigset_t mask)
+do_rt_sigsuspend(struct pt_regs *regs)
 {
-        sigset_t blocked;
-        siginitset(&blocked, mask);
-        return sigsuspend(&blocked);
+        sigset_t *unewset = (sigset_t *)regs->er1;
+        size_t sigsetsize = (size_t)regs->er2;
+        sigset_t saveset, newset;
+
+        /* XXX: Don't preclude handling different sized sigset_t's.  */
+        if (sigsetsize != sizeof(sigset_t))
+                return -EINVAL;
+
+        if (copy_from_user(&newset, unewset, sizeof(newset)))
+                return -EFAULT;
+        sigdelsetmask(&newset, ~_BLOCKABLE);
+
+        spin_lock_irq(&current->sighand->siglock);
+        saveset = current->blocked;
+        current->blocked = newset;
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+
+        regs->er0 = -EINTR;
+        while (1) {
+                current->state = TASK_INTERRUPTIBLE;
+                schedule();
+                if (do_signal(regs, &saveset))
+                        return -EINTR;
+        }
 }
 
 asmlinkage int 
@@ -68,10 +116,10 @@ sys_sigaction(int sig, const struct old_sigaction *act,
                 old_sigset_t mask;
                 if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
                     __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
-                    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
-                    __get_user(mask, &act->sa_mask))
+                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
                         return -EFAULT;
+                __get_user(new_ka.sa.sa_flags, &act->sa_flags);
+                __get_user(mask, &act->sa_mask);
                 siginitset(&new_ka.sa.sa_mask, mask);
         }
 
@@ -80,10 +128,10 @@ sys_sigaction(int sig, const struct old_sigaction *act,
         if (!ret && oact) {
                 if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
                     __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
-                    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
-                    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
+                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
                         return -EFAULT;
+                __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+                __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
         }
 
         return ret;
@@ -183,7 +231,11 @@ asmlinkage int do_sigreturn(unsigned long __unused,...)
                               sizeof(frame->extramask))))
                 goto badframe;
 
-        set_current_blocked(&set);
+        sigdelsetmask(&set, ~_BLOCKABLE);
+        spin_lock_irq(&current->sighand->siglock);
+        current->blocked = set;
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
         
         if (restore_sigcontext(regs, &frame->sc, &er0))
                 goto badframe;
@@ -207,7 +259,11 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused,...)
         if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                 goto badframe;
 
-        set_current_blocked(&set);
+        sigdelsetmask(&set, ~_BLOCKABLE);
+        spin_unlock_irq(&current->sighand->siglock);
+        current->blocked = set;
+        recalc_sigpending();
+        spin_lock_irq(&current->sighand->siglock);
         
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0))
                 goto badframe;
@@ -258,7 +314,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
         return (void *)((usp - frame_size) & -8UL);
 }
 
-static int setup_frame (int sig, struct k_sigaction *ka,
+static void setup_frame (int sig, struct k_sigaction *ka,
                          sigset_t *set, struct pt_regs *regs)
 {
         struct sigframe *frame;
@@ -319,14 +375,13 @@ static int setup_frame (int sig, struct k_sigaction *ka,
         regs->er1 = (unsigned long)&(frame->sc);
         regs->er5 = current->mm->start_data;    /* GOT base */
 
-        return 0;
+        return;
 
 give_sigsegv:
         force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
+static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
                             sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe *frame;
@@ -395,11 +450,10 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->er2 = (unsigned long)&frame->uc;
         regs->er5 = current->mm->start_data;    /* GOT base */
 
-        return 0;
+        return;
 
 give_sigsegv:
         force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
@@ -407,10 +461,8 @@ give_sigsegv:
  */
 static void
 handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
-              struct pt_regs * regs)
+              sigset_t *oldset, struct pt_regs * regs)
 {
-        sigset_t *oldset = sigmask_to_save();
-        int ret;
         /* are we from a system call? */
         if (regs->orig_er0 >= 0) {
                 switch (regs->er0) {
@@ -433,12 +485,16 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
 
         /* set up the stack frame */
         if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+                setup_rt_frame(sig, ka, info, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
-
-        if (!ret)
-                signal_delivered(sig, info, ka, regs, 0);
+                setup_frame(sig, ka, oldset, regs);
+
+        spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
+                sigaddset(&current->blocked,sig);
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
 }
 
 /*
@@ -446,7 +502,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
  * want to handle. Thus you cannot kill init even with a SIGKILL even by
  * mistake.
  */
-static void do_signal(struct pt_regs *regs)
+asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset)
 {
         siginfo_t info;
         int signr;
@@ -459,16 +515,23 @@ static void do_signal(struct pt_regs *regs)
          * if so.
          */
         if ((regs->ccr & 0x10))
-                return;
+                return 1;
+
+        if (try_to_freeze())
+                goto no_signal;
 
         current->thread.esp0 = (unsigned long) regs;
 
+        if (!oldset)
+                oldset = &current->blocked;
+
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
         if (signr > 0) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
-                return;
+                handle_signal(signr, &info, &ka, oldset, regs);
+                return 1;
         }
+ no_signal:
         /* Did we come from a system call? */
         if (regs->orig_er0 >= 0) {
                 /* Restart the system call - no handlers present */
@@ -483,18 +546,18 @@ static void do_signal(struct pt_regs *regs)
                         regs->pc -= 2;
                 }
         }
-
-        /* If there's no signal to deliver, we just restore the saved mask.  */
-        restore_saved_sigmask();
+        return 0;
 }
 
 asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)
 {
-        if (thread_info_flags & _TIF_SIGPENDING)
-                do_signal(regs);
+        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+                do_signal(regs, NULL);
 
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
         }
 }
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index bf350cb7f59..aaf5e5a48f9 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -46,3 +46,28 @@ asmlinkage void syscall_print(void *dummy,...)
                ((regs->pc)&0xffffff)-2,regs->orig_er0,regs->er1,regs->er2,regs->er3,regs->er0);
 }
 #endif
+
+/*
+ * Do a system call from kernel instead of calling sys_execve so we
+ * end up with proper pt_regs.
+ */
+int kernel_execve(const char *filename,
+                  const char *const argv[],
+                  const char *const envp[])
+{
+        register long res __asm__("er0");
+        register const char *const *_c __asm__("er3") = envp;
+        register const char *const *_b __asm__("er2") = argv;
+        register const char * _a __asm__("er1") = filename;
+        __asm__ __volatile__ ("mov.l %1,er0\n\t"
+                        "trapa  #0\n\t"
+                        : "=r" (res)
+                        : "g" (__NR_execve),
+                          "g" (_a),
+                          "g" (_b),
+                          "g" (_c)
+                        : "cc", "memory");
+        return res;
+}
+
+
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index b74dd0ade58..4be2ea2fbe2 100644
--- a/arch/h8300/kernel/syscalls.S
+++ b/arch/h8300/kernel/syscalls.S
@@ -340,12 +340,27 @@ SYMBOL_NAME_LABEL(sys_call_table)
         bra     SYMBOL_NAME(syscall_trampoline):8
         .endm
 
+SYMBOL_NAME_LABEL(sys_clone)    
+        call_sp h8300_clone
+        
+SYMBOL_NAME_LABEL(sys_sigsuspend)
+        call_sp do_sigsuspend
+
+SYMBOL_NAME_LABEL(sys_rt_sigsuspend)
+        call_sp do_rt_sigsuspend
+
 SYMBOL_NAME_LABEL(sys_sigreturn)
         call_sp do_sigreturn
 
 SYMBOL_NAME_LABEL(sys_rt_sigreturn)
         call_sp do_rt_sigreturn
 
+SYMBOL_NAME_LABEL(sys_fork)
+        call_sp h8300_fork
+
+SYMBOL_NAME_LABEL(sys_vfork)
+        call_sp h8300_vfork
+
 SYMBOL_NAME_LABEL(syscall_trampoline)
         mov.l   sp,er0
         jmp     @er6
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index e0f74191d55..32263a138aa 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -27,7 +27,6 @@
 #include <linux/profile.h>
 
 #include <asm/io.h>
-#include <asm/irq_regs.h>
 #include <asm/timer.h>
 
 #define TICK_SIZE (tick_nsec / 1000)
diff --git a/arch/h8300/kernel/timer/itu.c b/arch/h8300/kernel/timer/itu.c
index 0a8b5cd5bf3..a2ae5e95213 100644
--- a/arch/h8300/kernel/timer/itu.c
+++ b/arch/h8300/kernel/timer/itu.c
@@ -62,7 +62,7 @@ static struct irqaction itu_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initconst divide_rate[] = {1, 2, 4, 8};
+static const int __initdata divide_rate[] = {1, 2, 4, 8};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/timer16.c b/arch/h8300/kernel/timer/timer16.c
index 462d9f58171..ae0d3816113 100644
--- a/arch/h8300/kernel/timer/timer16.c
+++ b/arch/h8300/kernel/timer/timer16.c
@@ -57,7 +57,7 @@ static struct irqaction timer16_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initconst divide_rate[] = {1, 2, 4, 8};
+static const int __initdata divide_rate[] = {1, 2, 4, 8};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c
index 505f3415b40..7a1533fad47 100644
--- a/arch/h8300/kernel/timer/timer8.c
+++ b/arch/h8300/kernel/timer/timer8.c
@@ -77,7 +77,7 @@ static struct irqaction timer8_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initconst divide_rate[] = {8, 64, 8192};
+static const int __initdata divide_rate[] = {8, 64, 8192};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c
index 0350f6204ec..2193a2e2859 100644
--- a/arch/h8300/kernel/timer/tpu.c
+++ b/arch/h8300/kernel/timer/tpu.c
@@ -66,7 +66,7 @@ static struct irqaction tpu_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initconst divide_rate[] = {
+static const int __initdata divide_rate[] = {
 #if CONFIG_H8300_TPU_CH == 0
         1,4,16,64,0,0,0,0,
 #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)
diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c
index 7833aa3e7c7..dfa05bd908b 100644
--- a/arch/h8300/kernel/traps.c
+++ b/arch/h8300/kernel/traps.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/bug.h>
 
+#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/page.h>