Patched in Tegra support.

16 files changed, 284 insertions, 112 deletions

diff --git a/arch/frv/kernel/Makefile b/arch/frv/kernel/Makefile
index 3cbb3294b9f..c36f70b6699 100644
--- a/arch/frv/kernel/Makefile
+++ b/arch/frv/kernel/Makefile
@@ -5,10 +5,10 @@
 heads-y                         := head-uc-fr401.o head-uc-fr451.o head-uc-fr555.o
 heads-$(CONFIG_MMU)             := head-mmu-fr451.o
 
-extra-y:= head.o vmlinux.lds
+extra-y:= head.o init_task.o vmlinux.lds
 
-obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o \
-         process.o traps.o ptrace.o signal.o dma.o \
+obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \
+         kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \
          sys_frv.o time.o setup.o frv_ksyms.o \
          debug-stub.o irq.o sleep.o uaccess.o
 
diff --git a/arch/frv/kernel/debug-stub.c b/arch/frv/kernel/debug-stub.c
index a0228f717ef..2845139c807 100644
--- a/arch/frv/kernel/debug-stub.c
+++ b/arch/frv/kernel/debug-stub.c
@@ -17,6 +17,7 @@
 #include <linux/serial_reg.h>
 #include <linux/start_kernel.h>
 
+#include <asm/system.h>
 #include <asm/serial-regs.h>
 #include <asm/timer-regs.h>
 #include <asm/irc-regs.h>
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index dfcd263c051..5ba23f715ea 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -863,14 +863,6 @@ ret_from_fork:
         setlos.p        #0,gr8
         bra             __syscall_exit
 
-        .globl          ret_from_kernel_thread
-ret_from_kernel_thread:
-        lddi.p          @(gr28,#REG_GR(8)),gr20
-        call            schedule_tail
-        calll.p         @(gr21,gr0)
-        or              gr20,gr20,gr8
-        bra             __syscall_exit
-
 ###################################################################################################
 #
 # Return to user mode is not as complex as all this looks,
@@ -913,19 +905,18 @@ __syscall_call:
 __syscall_exit:
         LEDS            0x6300
 
-        # keep current PSR in GR23
-        movsg           psr,gr23
-
-        ldi             @(gr28,#REG_PSR),gr22
-
-        sti.p           gr8,@(gr28,#REG_GR(8))  ; save return value
+        sti             gr8,@(gr28,#REG_GR(8))  ; save return value
 
         # rebuild saved psr - execve will change it for init/main.c
+        ldi             @(gr28,#REG_PSR),gr22
         srli            gr22,#1,gr5
         andi.p          gr22,#~PSR_PS,gr22
         andi            gr5,#PSR_PS,gr5
         or              gr5,gr22,gr22
-        ori.p           gr22,#PSR_S,gr22
+        ori             gr22,#PSR_S,gr22
+
+        # keep current PSR in GR23
+        movsg           psr,gr23
 
         # make sure we don't miss an interrupt setting need_resched or sigpending between
         # sampling and the RETT
@@ -933,7 +924,9 @@ __syscall_exit:
         movgs           gr23,psr
 
         ldi             @(gr15,#TI_FLAGS),gr4
-        andicc          gr4,#_TIF_ALLWORK_MASK,gr0,icc0
+        sethi.p         %hi(_TIF_ALLWORK_MASK),gr5
+        setlo           %lo(_TIF_ALLWORK_MASK),gr5
+        andcc           gr4,gr5,gr0,icc0
         bne             icc0,#0,__syscall_exit_work
 
         # restore all registers and return
@@ -1075,10 +1068,27 @@ __entry_return_from_kernel_interrupt:
         subicc          gr5,#0,gr0,icc0
         beq             icc0,#0,__entry_return_direct
 
-        subcc           gr0,gr0,gr0,icc2                /* set Z and clear C */
-        call            preempt_schedule_irq
-#endif
+__entry_preempt_need_resched:
+        ldi             @(gr15,#TI_FLAGS),gr4
+        andicc          gr4,#_TIF_NEED_RESCHED,gr0,icc0
+        beq             icc0,#1,__entry_return_direct
+
+        setlos          #PREEMPT_ACTIVE,gr5
+        sti             gr5,@(gr15,#TI_FLAGS)
+
+        andi            gr23,#~PSR_PIL,gr23
+        movgs           gr23,psr
+
+        call            schedule
+        sti             gr0,@(gr15,#TI_PRE_COUNT)
+
+        movsg           psr,gr23
+        ori             gr23,#PSR_PIL_14,gr23
+        movgs           gr23,psr
+        bra             __entry_preempt_need_resched
+#else
         bra             __entry_return_direct
+#endif
 
 
 ###############################################################################
@@ -1101,7 +1111,9 @@ __entry_resume_userspace:
 __entry_return_from_user_interrupt:
         LEDS            0x6402
         ldi             @(gr15,#TI_FLAGS),gr4
-        andicc          gr4,#_TIF_WORK_MASK,gr0,icc0
+        sethi.p         %hi(_TIF_WORK_MASK),gr5
+        setlo           %lo(_TIF_WORK_MASK),gr5
+        andcc           gr4,gr5,gr0,icc0
         beq             icc0,#1,__entry_return_direct
 
 __entry_work_pending:
@@ -1121,7 +1133,9 @@ __entry_work_resched:
 
         LEDS            0x6401
         ldi             @(gr15,#TI_FLAGS),gr4
-        andicc          gr4,#_TIF_WORK_MASK,gr0,icc0
+        sethi.p         %hi(_TIF_WORK_MASK),gr5
+        setlo           %lo(_TIF_WORK_MASK),gr5
+        andcc           gr4,gr5,gr0,icc0
         beq             icc0,#1,__entry_return_direct
         andicc          gr4,#_TIF_NEED_RESCHED,gr0,icc0
         bne             icc0,#1,__entry_work_resched
@@ -1149,9 +1163,7 @@ __syscall_trace_entry:
         # perform syscall exit tracing
 __syscall_exit_work:
         LEDS            0x6340
-        andicc          gr22,#PSR_PS,gr0,icc1   ; don't handle on return to kernel mode
-        andicc.p        gr4,#_TIF_SYSCALL_TRACE,gr0,icc0
-        bne             icc1,#0,__entry_return_direct
+        andicc          gr4,#_TIF_SYSCALL_TRACE,gr0,icc0
         beq             icc0,#1,__entry_work_pending
 
         movsg           psr,gr23
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c
index 86c516d96dc..a89803b58b9 100644
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
@@ -30,6 +30,7 @@ EXPORT_SYMBOL(ip_fast_csum);
 EXPORT_SYMBOL(local_irq_count);
 EXPORT_SYMBOL(local_bh_count);
 #endif
+EXPORT_SYMBOL(kernel_thread);
 
 EXPORT_SYMBOL(__res_bus_clock_speed_HZ);
 EXPORT_SYMBOL(__page_offset);
diff --git a/arch/frv/kernel/gdb-io.c b/arch/frv/kernel/gdb-io.c
index 0707d35079b..2ca641d199f 100644
--- a/arch/frv/kernel/gdb-io.c
+++ b/arch/frv/kernel/gdb-io.c
@@ -19,6 +19,7 @@
 #include <linux/serial_reg.h>
 
 #include <asm/pgtable.h>
+#include <asm/system.h>
 #include <asm/irc-regs.h>
 #include <asm/timer-regs.h>
 #include <asm/gdb-stub.h>
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index bbe78b0bffe..a4dba6b20bd 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -126,6 +126,7 @@
 
 #include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
+#include <asm/system.h>
 #include <asm/gdb-stub.h>
 
 #define LEDS(x) do { /* *(u32*)0xe1200004 = ~(x); mb(); */ } while(0)
@@ -671,7 +672,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if ((uint32_t)mem&1 && count>=1) {
                 if (!gdbstub_read_byte(mem,ch))
                         return NULL;
-                buf = hex_byte_pack(buf, ch[0]);
+                buf = pack_hex_byte(buf, ch[0]);
                 mem++;
                 count--;
         }
@@ -679,8 +680,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if ((uint32_t)mem&3 && count>=2) {
                 if (!gdbstub_read_word(mem,(uint16_t *)ch))
                         return NULL;
-                buf = hex_byte_pack(buf, ch[0]);
-                buf = hex_byte_pack(buf, ch[1]);
+                buf = pack_hex_byte(buf, ch[0]);
+                buf = pack_hex_byte(buf, ch[1]);
                 mem += 2;
                 count -= 2;
         }
@@ -688,10 +689,10 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         while (count>=4) {
                 if (!gdbstub_read_dword(mem,(uint32_t *)ch))
                         return NULL;
-                buf = hex_byte_pack(buf, ch[0]);
-                buf = hex_byte_pack(buf, ch[1]);
-                buf = hex_byte_pack(buf, ch[2]);
-                buf = hex_byte_pack(buf, ch[3]);
+                buf = pack_hex_byte(buf, ch[0]);
+                buf = pack_hex_byte(buf, ch[1]);
+                buf = pack_hex_byte(buf, ch[2]);
+                buf = pack_hex_byte(buf, ch[3]);
                 mem += 4;
                 count -= 4;
         }
@@ -699,8 +700,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if (count>=2) {
                 if (!gdbstub_read_word(mem,(uint16_t *)ch))
                         return NULL;
-                buf = hex_byte_pack(buf, ch[0]);
-                buf = hex_byte_pack(buf, ch[1]);
+                buf = pack_hex_byte(buf, ch[0]);
+                buf = pack_hex_byte(buf, ch[1]);
                 mem += 2;
                 count -= 2;
         }
@@ -708,7 +709,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if (count>=1) {
                 if (!gdbstub_read_byte(mem,ch))
                         return NULL;
-                buf = hex_byte_pack(buf, ch[0]);
+                buf = pack_hex_byte(buf, ch[0]);
         }
 
         *buf = 0;
@@ -1497,21 +1498,21 @@ void gdbstub(int sigval)
                 ptr = mem2hex(title, ptr, sizeof(title) - 1,0);
 
                 hx = hex_asc_hi(brr >> 24);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_lo(brr >> 24);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_hi(brr >> 16);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_lo(brr >> 16);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_hi(brr >> 8);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_lo(brr >> 8);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_hi(brr);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
                 hx = hex_asc_lo(brr);
-                ptr = hex_byte_pack(ptr, hx);
+                ptr = pack_hex_byte(ptr, hx);
 
                 ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
                 *ptr = 0;
@@ -1525,10 +1526,10 @@ void gdbstub(int sigval)
 
         /* Send trap type (converted to signal) */
         *ptr++ = 'T';
-        ptr = hex_byte_pack(ptr, sigval);
+        ptr = pack_hex_byte(ptr, sigval);
 
         /* Send Error PC */
-        ptr = hex_byte_pack(ptr, GDB_REG_PC);
+        ptr = pack_hex_byte(ptr, GDB_REG_PC);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0);
         *ptr++ = ';';
@@ -1536,7 +1537,7 @@ void gdbstub(int sigval)
         /*
          * Send frame pointer
          */
-        ptr = hex_byte_pack(ptr, GDB_REG_FP);
+        ptr = pack_hex_byte(ptr, GDB_REG_FP);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0);
         *ptr++ = ';';
@@ -1544,7 +1545,7 @@ void gdbstub(int sigval)
         /*
          * Send stack pointer
          */
-        ptr = hex_byte_pack(ptr, GDB_REG_SP);
+        ptr = pack_hex_byte(ptr, GDB_REG_SP);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0);
         *ptr++ = ';';
diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c
index 2cc327a1ca4..9afc2ea400d 100644
--- a/arch/frv/kernel/irq-mb93091.c
+++ b/arch/frv/kernel/irq-mb93091.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/irc-regs.h>
diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c
index 95e4eb4f1f3..4d4ad09d3c9 100644
--- a/arch/frv/kernel/irq-mb93093.c
+++ b/arch/frv/kernel/irq-mb93093.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/irc-regs.h>
diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index ba648da0932..4d034c7840c 100644
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/irc-regs.h>
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 2239346fa3d..3facbc28cbb 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -28,6 +28,7 @@
 #include <linux/atomic.h>
 #include <asm/io.h>
 #include <asm/smp.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 0b579927439..5fa3889d858 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -153,22 +153,23 @@ static int user_atoi(char __user *ubuf, size_t len)
 static int sysctl_pm_do_suspend(ctl_table *ctl, int write,
                                 void __user *buffer, size_t *lenp, loff_t *fpos)
 {
-        int mode;
+        int retval, mode;
 
         if (*lenp <= 0)
                 return -EIO;
 
         mode = user_atoi(buffer, *lenp);
-        switch (mode) {
-        case 1:
-            return pm_do_suspend();
-
-        case 5:
-            return pm_do_bus_sleep();
+        if ((mode != 1) && (mode != 5))
+                return -EINVAL;
 
-        default:
-            return -EINVAL;
+        if (retval == 0) {
+                if (mode == 5)
+                    retval = pm_do_bus_sleep();
+                else
+                    retval = pm_do_suspend();
         }
+
+        return retval;
 }
 
 static int try_set_cmode(int new_cmode)
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 23916b2a12a..3901df1213c 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -25,10 +25,10 @@
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
 #include <linux/pagemap.h>
-#include <linux/rcupdate.h>
 
 #include <asm/asm-offsets.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 #include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/tlb.h>
@@ -38,13 +38,27 @@
 #include "local.h"
 
 asmlinkage void ret_from_fork(void);
-asmlinkage void ret_from_kernel_thread(void);
 
 #include <asm/pgalloc.h>
 
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
+struct task_struct *alloc_task_struct_node(int node)
+{
+        struct task_struct *p = kmalloc_node(THREAD_SIZE, GFP_KERNEL, node);
+
+        if (p)
+                atomic_set((atomic_t *)(p+1), 1);
+        return p;
+}
+
+void free_task_struct(struct task_struct *p)
+{
+        if (atomic_dec_and_test((atomic_t *)(p+1)))
+                kfree(p);
+}
+
 static void core_sleep_idle(void)
 {
 #ifdef LED_DEBUG_SLEEP
@@ -71,16 +85,16 @@ void cpu_idle(void)
 {
         /* endless idle loop with no priority at all */
         while (1) {
-                rcu_idle_enter();
                 while (!need_resched()) {
                         check_pgt_cache();
 
                         if (!frv_dma_inprogress && idle)
                                 idle();
                 }
-                rcu_idle_exit();
 
-                schedule_preempt_disabled();
+                preempt_enable_no_resched();
+                schedule();
+                preempt_disable();
         }
 }
 
@@ -139,40 +153,87 @@ inline unsigned long user_stack(const struct pt_regs *regs)
         return user_mode(regs) ? regs->sp : 0;
 }
 
+asmlinkage int sys_fork(void)
+{
+#ifndef CONFIG_MMU
+        /* fork almost works, enough to trick you into looking elsewhere:-( */
+        return -EINVAL;
+#else
+        return do_fork(SIGCHLD, user_stack(__frame), __frame, 0, NULL, NULL);
+#endif
+}
+
+asmlinkage int sys_vfork(void)
+{
+        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, user_stack(__frame), __frame, 0,
+                       NULL, NULL);
+}
+
+/*****************************************************************************/
+/*
+ * clone a process
+ * - tlsptr is retrieved by copy_thread()
+ */
+asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
+                         int __user *parent_tidptr, int __user *child_tidptr,
+                         int __user *tlsptr)
+{
+        if (!newsp)
+                newsp = user_stack(__frame);
+        return do_fork(clone_flags, newsp, __frame, 0, parent_tidptr, child_tidptr);
+} /* end sys_clone() */
+
+/*****************************************************************************/
+/*
+ * This gets called before we allocate a new thread and copy
+ * the current task into it.
+ */
+void prepare_to_copy(struct task_struct *tsk)
+{
+        //unlazy_fpu(tsk);
+} /* end prepare_to_copy() */
+
+/*****************************************************************************/
 /*
  * set up the kernel stack and exception frames for a new process
  */
 int copy_thread(unsigned long clone_flags,
-                unsigned long usp, unsigned long arg,
-                struct task_struct *p)
+                unsigned long usp, unsigned long topstk,
+                struct task_struct *p, struct pt_regs *regs)
 {
-        struct pt_regs *childregs;
+        struct pt_regs *childregs0, *childregs, *regs0;
 
-        childregs = (struct pt_regs *)
+        regs0 = __kernel_frame0_ptr;
+        childregs0 = (struct pt_regs *)
                 (task_stack_page(p) + THREAD_SIZE - FRV_FRAME0_SIZE);
+        childregs = childregs0;
 
         /* set up the userspace frame (the only place that the USP is stored) */
-        *childregs = *current_pt_regs();
+        *childregs0 = *regs0;
+
+        childregs0->gr8         = 0;
+        childregs0->sp          = usp;
+        childregs0->next_frame  = NULL;
+
+        /* set up the return kernel frame if called from kernel_thread() */
+        if (regs != regs0) {
+                childregs--;
+                *childregs = *regs;
+                childregs->sp = (unsigned long) childregs0;
+                childregs->next_frame = childregs0;
+                childregs->gr15 = (unsigned long) task_thread_info(p);
+                childregs->gr29 = (unsigned long) p;
+        }
+
+        p->set_child_tid = p->clear_child_tid = NULL;
 
         p->thread.frame  = childregs;
         p->thread.curr   = p;
         p->thread.sp     = (unsigned long) childregs;
         p->thread.fp     = 0;
         p->thread.lr     = 0;
-        p->thread.frame0 = childregs;
-
-        if (unlikely(p->flags & PF_KTHREAD)) {
-                childregs->gr9 = usp; /* function */
-                childregs->gr8 = arg;
-                p->thread.pc = (unsigned long) ret_from_kernel_thread;
-                save_user_regs(p->thread.user);
-                return 0;
-        }
-        if (usp)
-                childregs->sp = usp;
-        childregs->next_frame   = NULL;
-
-        p->thread.pc = (unsigned long) ret_from_fork;
+        p->thread.pc     = (unsigned long) ret_from_fork;
+        p->thread.frame0 = childregs0;
 
         /* the new TLS pointer is passed in as arg #5 to sys_clone() */
         if (clone_flags & CLONE_SETTLS)
@@ -183,6 +244,25 @@ int copy_thread(unsigned long clone_flags,
         return 0;
 } /* end copy_thread() */
 
+/*
+ * sys_execve() executes a new program.
+ */
+asmlinkage int sys_execve(const char __user *name,
+                          const char __user *const __user *argv,
+                          const char __user *const __user *envp)
+{
+        int error;
+        char * filename;
+
+        filename = getname(name);
+        error = PTR_ERR(filename);
+        if (IS_ERR(filename))
+                return error;
+        error = do_execve(filename, argv, envp, __frame);
+        putname(filename);
+        return error;
+}
+
 unsigned long get_wchan(struct task_struct *p)
 {
         struct pt_regs *regs0;
diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c
index 3987ff88dab..9d68f7fac73 100644
--- a/arch/frv/kernel/ptrace.c
+++ b/arch/frv/kernel/ptrace.c
@@ -26,6 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/unistd.h>
 
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index a5136474c6f..75cf7f4b2fa 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -112,11 +112,9 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 #ifdef CONFIG_PM
 #define __pminit
 #define __pminitdata
-#define __pminitconst
 #else
 #define __pminit __init
 #define __pminitdata __initdata
-#define __pminitconst __initconst
 #endif
 
 struct clock_cmode {
@@ -186,7 +184,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = {
         [6]     = {     _x1,    _x1_5,  _x1_5,  _x4_5,  _x0_375 },
 };
 
-static const struct clock_cmode __pminitconst *clock_cmodes;
+static const struct clock_cmode __pminitdata *clock_cmodes;
 static int __pminitdata clock_doubled;
 
 static struct uart_port __pminitdata __frv_uart0 = {
@@ -804,9 +802,9 @@ void __init setup_arch(char **cmdline_p)
 
         BUG_ON(memory_start == memory_end);
 
-        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;
 #if 0 /* DAVIDM - don't set brk just incase someone decides to use it */
         init_mm.brk = (unsigned long) &_end;
 #else
@@ -814,8 +812,10 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef DEBUG
-        printk("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("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);
 #endif
 
 #ifdef CONFIG_VT
@@ -852,7 +852,7 @@ void __init setup_arch(char **cmdline_p)
 /*
  *
  */
-static int setup_arch_serial(void)
+static int __devinit setup_arch_serial(void)
 {
         /* register those serial ports that are available */
 #ifndef CONFIG_GDBSTUB_UART0
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 535810a3217..bab01298b58 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -20,6 +20,7 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/personality.h>
+#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -27,6 +28,8 @@
 
 #define DEBUG_SIG 0
 
+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+
 struct fdpic_func_descriptor {
         unsigned long   text;
         unsigned long   GOT;
@@ -37,9 +40,17 @@ struct fdpic_func_descriptor {
  */
 asmlinkage int sys_sigsuspend(int history0, int history1, old_sigset_t mask)
 {
-        sigset_t blocked;
-        siginitset(&blocked, mask);
-        return sigsuspend(&blocked);
+        mask &= _BLOCKABLE;
+        spin_lock_irq(&current->sighand->siglock);
+        current->saved_sigmask = current->blocked;
+        siginitset(&current->blocked, mask);
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+
+        current->state = TASK_INTERRUPTIBLE;
+        schedule();
+        set_thread_flag(TIF_RESTORE_SIGMASK);
+        return -ERESTARTNOHAND;
 }
 
 asmlinkage int sys_sigaction(int sig,
@@ -53,10 +64,10 @@ asmlinkage int sys_sigaction(int sig,
                 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);
         }
 
@@ -65,10 +76,10 @@ asmlinkage int sys_sigaction(int sig,
         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;
@@ -146,7 +157,11 @@ asmlinkage int sys_sigreturn(void)
             __copy_from_user(&set.sig[1], &frame->extramask, 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(&frame->sc, &gr8))
                 goto badframe;
@@ -168,7 +183,11 @@ asmlinkage int sys_rt_sigreturn(void)
         if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                 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(&frame->uc.uc_mcontext, &gr8))
                 goto badframe;
@@ -297,6 +316,10 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
         __frame->lr   = (unsigned long) &frame->retcode;
         __frame->gr8  = sig;
 
+        /* the tracer may want to single-step inside the handler */
+        if (test_thread_flag(TIF_SINGLESTEP))
+                ptrace_notify(SIGTRAP);
+
 #if DEBUG_SIG
         printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
                sig, current->comm, current->pid, frame, __frame->pc,
@@ -395,6 +418,10 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         __frame->gr8 = sig;
         __frame->gr9 = (unsigned long) &frame->info;
 
+        /* the tracer may want to single-step inside the handler */
+        if (test_thread_flag(TIF_SINGLESTEP))
+                ptrace_notify(SIGTRAP);
+
 #if DEBUG_SIG
         printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
                sig, current->comm, current->pid, frame, __frame->pc,
@@ -413,10 +440,9 @@ give_sigsegv:
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(unsigned long sig, siginfo_t *info,
-                         struct k_sigaction *ka)
+static int handle_signal(unsigned long sig, siginfo_t *info,
+                         struct k_sigaction *ka, sigset_t *oldset)
 {
-        sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Are we from a system call? */
@@ -448,11 +474,18 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         else
                 ret = setup_frame(sig, ka, oldset);
 
-        if (ret)
-                return;
+        if (ret == 0) {
+                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);
+        }
+
+        return ret;
 
-        signal_delivered(sig, info, ka, __frame,
-                                 test_thread_flag(TIF_SINGLESTEP));
 } /* end handle_signal() */
 
 /*****************************************************************************/
@@ -465,14 +498,44 @@ static void do_signal(void)
 {
         struct k_sigaction ka;
         siginfo_t info;
+        sigset_t *oldset;
         int signr;
 
+        /*
+         * We want the common case to go fast, which
+         * is why we may in certain cases get here from
+         * kernel mode. Just return without doing anything
+         * if so.
+         */
+        if (!user_mode(__frame))
+                return;
+
+        if (try_to_freeze())
+                goto no_signal;
+
+        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                oldset = &current->saved_sigmask;
+        else
+                oldset = &current->blocked;
+
         signr = get_signal_to_deliver(&info, &ka, __frame, NULL);
         if (signr > 0) {
-                handle_signal(signr, &info, &ka);
+                if (handle_signal(signr, &info, &ka, oldset) == 0) {
+                        /* a signal was successfully delivered; the saved
+                         * sigmask will have been stored in the signal frame,
+                         * and will be restored by sigreturn, so we can simply
+                         * clear the TIF_RESTORE_SIGMASK flag */
+                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                                clear_thread_flag(TIF_RESTORE_SIGMASK);
+
+                        tracehook_signal_handler(signr, &info, &ka, __frame,
+                                                 test_thread_flag(TIF_SINGLESTEP));
+                }
+
                 return;
         }
 
+no_signal:
         /* Did we come from a system call? */
         if (__frame->syscallno != -1) {
                 /* Restart the system call - no handlers present */
@@ -494,7 +557,11 @@ static void do_signal(void)
 
         /* if there's no signal to deliver, we just put the saved sigmask
          * back */
-        restore_saved_sigmask();
+        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
+        }
+
 } /* end do_signal() */
 
 /*****************************************************************************/
@@ -509,13 +576,15 @@ asmlinkage void do_notify_resume(__u32 thread_info_flags)
                 clear_thread_flag(TIF_SINGLESTEP);
 
         /* deal with pending signal delivery */
-        if (thread_info_flags & _TIF_SIGPENDING)
+        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
                 do_signal();
 
         /* deal with notification on about to resume userspace execution */
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(__frame);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
         }
 
 } /* end do_notify_resume() */
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 5cfd1420b09..1d2dfe67d44 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -23,6 +23,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/setup.h>
 #include <asm/fpu.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/siginfo.h>