9 files changed, 52 insertions, 103 deletions

diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 87b95eb8aee5..3caf05cabfc5 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -3,6 +3,8 @@ generic-y += clkdev.h
 generic-y += cputime.h
 generic-y += exec.h
 generic-y += hash.h
+generic-y += irq_work.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h
index a34f309e5801..ae8d423e79d9 100644
--- a/arch/frv/include/asm/processor.h
+++ b/arch/frv/include/asm/processor.h
@@ -35,22 +35,6 @@
 struct task_struct;
 
 /*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- */
-struct cpuinfo_frv {
-#ifdef CONFIG_MMU
-        unsigned long   *pgd_quick;
-        unsigned long   *pte_quick;
-        unsigned long   pgtable_cache_sz;
-#endif
-} __cacheline_aligned;
-
-extern struct cpuinfo_frv __nongprelbss boot_cpu_data;
-
-#define cpu_data                (&boot_cpu_data)
-#define current_cpu_data        boot_cpu_data
-
-/*
  * Bus types
  */
 #define EISA_bus 0
@@ -129,7 +113,8 @@ unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)   ((tsk)->thread.frame0->pc)
 #define KSTK_ESP(tsk)   ((tsk)->thread.frame0->sp)
 
-#define cpu_relax()    barrier()
+#define cpu_relax() barrier()
+#define cpu_relax_lowlatency() cpu_relax()
 
 /* data cache prefetch */
 #define ARCH_HAS_PREFETCH
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h
deleted file mode 100644
index 0e5eb3018468..000000000000
--- a/arch/frv/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !_ASM_SCATTERLIST_H */
diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c
index 2cc327a1ca44..091b2839be90 100644
--- a/arch/frv/kernel/irq-mb93091.c
+++ b/arch/frv/kernel/irq-mb93091.c
@@ -107,25 +107,25 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask)
 static struct irqaction fpga_irq[4]  = {
         [0] = {
                 .handler        = fpga_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "fpga.0",
                 .dev_id         = (void *) 0x0028UL,
         },
         [1] = {
                 .handler        = fpga_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "fpga.1",
                 .dev_id         = (void *) 0x0050UL,
         },
         [2] = {
                 .handler        = fpga_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "fpga.2",
                 .dev_id         = (void *) 0x1c00UL,
         },
         [3] = {
                 .handler        = fpga_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "fpga.3",
                 .dev_id         = (void *) 0x6386UL,
         }
diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c
index 95e4eb4f1f38..1f3015cf80f5 100644
--- a/arch/frv/kernel/irq-mb93093.c
+++ b/arch/frv/kernel/irq-mb93093.c
@@ -105,7 +105,6 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask)
 static struct irqaction fpga_irq[1]  = {
         [0] = {
                 .handler        = fpga_interrupt,
-                .flags          = IRQF_DISABLED,
                 .name           = "fpga.0",
                 .dev_id         = (void *) 0x0700UL,
         }
diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index ba648da0932d..8ca5aa4ff595 100644
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.c
@@ -118,13 +118,13 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr)
 static struct irqaction mb93493_irq[2]  = {
         [0] = {
                 .handler        = mb93493_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "mb93493.0",
                 .dev_id         = (void *) __addr_MB93493_IQSR(0),
         },
         [1] = {
                 .handler        = mb93493_interrupt,
-                .flags          = IRQF_DISABLED | IRQF_SHARED,
+                .flags          = IRQF_SHARED,
                 .name           = "mb93493.1",
                 .dev_id         = (void *) __addr_MB93493_IQSR(1),
         }
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 9f3a7a62d787..9f4a9a607dbe 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -104,8 +104,6 @@ unsigned long __nongprelbss dma_coherent_mem_end;
 unsigned long __initdata __sdram_old_base;
 unsigned long __initdata num_mappedpages;
 
-struct cpuinfo_frv __nongprelbss boot_cpu_data;
-
 char __initdata command_line[COMMAND_LINE_SIZE];
 char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index d822700d4f15..dc3d59de0870 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -158,19 +158,10 @@ static int setup_sigcontext(struct sigcontext __user *sc, unsigned long mask)
 /*
  * Determine which stack to use..
  */
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         size_t frame_size)
 {
-        unsigned long sp;
-
-        /* Default to using normal stack */
-        sp = __frame->sp;
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (! sas_ss_flags(sp))
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
+        unsigned long sp = sigsp(__frame->sp, ksig);
 
         return (void __user *) ((sp - frame_size) & ~7UL);
 
@@ -180,17 +171,17 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
 /*
  *
  */
-static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
+static int setup_frame(struct ksignal *ksig, sigset_t *set)
 {
         struct sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
         set_fs(USER_DS);
 
-        frame = get_sigframe(ka, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -199,22 +190,22 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
                 rsig = __current_thread_info->exec_domain->signal_invmap[sig];
 
         if (__put_user(rsig, &frame->sig) < 0)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (setup_sigcontext(&frame->sc, set->sig[0]))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 if (__copy_to_user(frame->extramask, &set->sig[1],
                                    sizeof(frame->extramask)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* Set up to return from userspace.  If provided, use a stub
          * already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode) < 0)
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode) < 0)
+                        return -EFAULT;
         }
         else {
                 /* Set up the following code on the stack:
@@ -224,7 +215,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
                 if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||
                     __put_user(0x8efc0000|__NR_sigreturn, &frame->retcode[0]) ||
                     __put_user(0xc0700000, &frame->retcode[1]))
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 flush_icache_range((unsigned long) frame->retcode,
                                    (unsigned long) (frame->retcode + 2));
@@ -233,14 +224,14 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
         /* Set up registers for the signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *) ksig->ka.sa.sa_handler;
                 struct fdpic_func_descriptor desc;
                 if (copy_from_user(&desc, funcptr, sizeof(desc)))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 __frame->pc = desc.text;
                 __frame->gr15 = desc.GOT;
         } else {
-                __frame->pc   = (unsigned long) ka->sa.sa_handler;
+                __frame->pc   = (unsigned long) ksig->ka.sa.sa_handler;
                 __frame->gr15 = 0;
         }
 
@@ -255,29 +246,23 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
-
 } /* end setup_frame() */
 
 /*****************************************************************************/
 /*
  *
  */
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
 {
         struct rt_sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
         set_fs(USER_DS);
 
-        frame = get_sigframe(ka, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -288,28 +273,28 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (__put_user(rsig,            &frame->sig) ||
             __put_user(&frame->info,    &frame->pinfo) ||
             __put_user(&frame->uc,      &frame->puc))
-                goto give_sigsegv;
+                return -EFAULT;
 
-        if (copy_siginfo_to_user(&frame->info, info))
-                goto give_sigsegv;
+        if (copy_siginfo_to_user(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* Create the ucontext.  */
         if (__put_user(0, &frame->uc.uc_flags) ||
             __put_user(NULL, &frame->uc.uc_link) ||
             __save_altstack(&frame->uc.uc_stack, __frame->sp))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (setup_sigcontext(&frame->uc.uc_mcontext, set->sig[0]))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (__copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
          * already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode))
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode))
+                        return -EFAULT;
         }
         else {
                 /* Set up the following code on the stack:
@@ -319,7 +304,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||
                     __put_user(0x8efc0000|__NR_rt_sigreturn, &frame->retcode[0]) ||
                     __put_user(0xc0700000, &frame->retcode[1]))
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 flush_icache_range((unsigned long) frame->retcode,
                                    (unsigned long) (frame->retcode + 2));
@@ -328,14 +313,14 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         /* Set up registers for signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *) ksig->ka.sa.sa_handler;
                 struct fdpic_func_descriptor desc;
                 if (copy_from_user(&desc, funcptr, sizeof(desc)))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 __frame->pc = desc.text;
                 __frame->gr15 = desc.GOT;
         } else {
-                __frame->pc   = (unsigned long) ka->sa.sa_handler;
+                __frame->pc   = (unsigned long) ksig->ka.sa.sa_handler;
                 __frame->gr15 = 0;
         }
 
@@ -349,21 +334,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                sig, current->comm, current->pid, frame, __frame->pc,
                frame->pretcode);
 #endif
-
         return 0;
 
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
-
 } /* end setup_rt_frame() */
 
 /*****************************************************************************/
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(unsigned long sig, siginfo_t *info,
-                         struct k_sigaction *ka)
+static void handle_signal(struct ksignal *ksig)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -378,7 +357,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 __frame->gr8 = -EINTR;
                                 break;
                         }
@@ -392,16 +371,12 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         }
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset);
         else
-                ret = setup_frame(sig, ka, oldset);
-
-        if (ret)
-                return;
+                ret = setup_frame(ksig, oldset);
 
-        signal_delivered(sig, info, ka, __frame,
-                                 test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 } /* end handle_signal() */
 
 /*****************************************************************************/
@@ -412,13 +387,10 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
  */
 static void do_signal(void)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
-        signr = get_signal_to_deliver(&info, &ka, __frame, NULL);
-        if (signr > 0) {
-                handle_signal(signr, &info, &ka);
+        if (get_signal(&ksig)) {
+                handle_signal(&ksig);
                 return;
         }
 
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index b457de496b70..332e00bf9d06 100644
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -44,7 +44,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy);
 
 static struct irqaction timer_irq  = {
         .handler = timer_interrupt,
-        .flags = IRQF_DISABLED,
         .name = "timer",
 };