7 files changed, 36 insertions, 85 deletions

diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index 435b9671bd4b..1f39861eac8c 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -615,7 +615,7 @@ sys_call_table:
         .long sys_swapon
         .long sys_reboot
         .long sys_old_readdir
-        .long old_mmap          /* 90 */
+        .long sys_old_mmap      /* 90 */
         .long sys_munmap
         .long sys_truncate
         .long sys_ftruncate
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index 3db478eb5155..76266f80a5f1 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -10,7 +10,6 @@
  * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so
  * -traditional must not be used when assembling this file.
  */
-#include <linux/autoconf.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/intr_vect.h>
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 57668db25031..b6241198fb98 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)
 }
 
 static struct irq_chip crisv32_irq_type = {
-        .typename =    "CRISv32",
+        .name =        "CRISv32",
         .startup =     startup_crisv32_irq,
         .shutdown =    shutdown_crisv32_irq,
         .enable =      enable_crisv32_irq,
diff --git a/arch/cris/arch-v32/kernel/pinmux.c b/arch/cris/arch-v32/kernel/pinmux.c
index 6eb54ea1c976..f6f3637a4194 100644
--- a/arch/cris/arch-v32/kernel/pinmux.c
+++ b/arch/cris/arch-v32/kernel/pinmux.c
@@ -54,7 +54,7 @@ crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode mode)
 
         crisv32_pinmux_init();
 
-        if (port > PORTS)
+        if (port > PORTS || port < 0)
                 return -EINVAL;
 
         spin_lock_irqsave(&pinmux_lock, flags);
@@ -197,7 +197,7 @@ crisv32_pinmux_dealloc(int port, int first_pin, int last_pin)
 
         crisv32_pinmux_init();
 
-        if (port > PORTS)
+        if (port > PORTS || port < 0)
                 return -EINVAL;
 
         spin_lock_irqsave(&pinmux_lock, flags);
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 120e7f796fea..2661a9529d70 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -9,9 +9,9 @@
  */
 
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/reg_map.h>
 #include <hwregs/timer_defs.h>
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c
index dd401473f5b5..f4ebd1e7d0f5 100644
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -78,6 +78,35 @@ int put_reg(struct task_struct *task, unsigned int regno, unsigned long data)
         return 0;
 }
 
+void user_enable_single_step(struct task_struct *child)
+{
+        unsigned long tmp;
+
+        /*
+         * Set up SPC if not set already (in which case we have no other
+         * choice but to trust it).
+         */
+        if (!get_reg(child, PT_SPC)) {
+                /* In case we're stopped in a delay slot. */
+                tmp = get_reg(child, PT_ERP) & ~1;
+                put_reg(child, PT_SPC, tmp);
+        }
+        tmp = get_reg(child, PT_CCS) | SBIT_USER;
+        put_reg(child, PT_CCS, tmp);
+}
+
+void user_disable_single_step(struct task_struct *child)
+{
+        put_reg(child, PT_SPC, 0);
+
+        if (!get_debugreg(child->pid, PT_BP_CTRL)) {
+                unsigned long tmp;
+                /* If no h/w bp configured, disable S bit. */
+                tmp = get_reg(child, PT_CCS) & ~SBIT_USER;
+                put_reg(child, PT_CCS, tmp);
+        }
+}
+
 /*
  * Called by kernel/ptrace.c when detaching.
  *
@@ -89,8 +118,7 @@ ptrace_disable(struct task_struct *child)
         unsigned long tmp;
 
         /* Deconfigure SPC and S-bit. */
-        tmp = get_reg(child, PT_CCS) & ~SBIT_USER;
-        put_reg(child, PT_CCS, tmp);
+        user_disable_single_step(child);
         put_reg(child, PT_SPC, 0);
 
         /* Deconfigure any watchpoints associated with the child. */
@@ -169,83 +197,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = 0;
                         break;
 
-                case PTRACE_SYSCALL:
-                case PTRACE_CONT:
-                        ret = -EIO;
-
-                        if (!valid_signal(data))
-                                break;
-
-                        /* Continue means no single-step. */
-                        put_reg(child, PT_SPC, 0);
-
-                        if (!get_debugreg(child->pid, PT_BP_CTRL)) {
-                                unsigned long tmp;
-                                /* If no h/w bp configured, disable S bit. */
-                                tmp = get_reg(child, PT_CCS) & ~SBIT_USER;
-                                put_reg(child, PT_CCS, tmp);
-                        }
-
-                        if (request == PTRACE_SYSCALL) {
-                                set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                        }
-                        else {
-                                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                        }
-
-                        child->exit_code = data;
-
-                        /* TODO: make sure any pending breakpoint is killed */
-                        wake_up_process(child);
-                        ret = 0;
-
-                        break;
-
-                /* Make the child exit by sending it a sigkill. */
-                case PTRACE_KILL:
-                        ret = 0;
-
-                        if (child->exit_state == EXIT_ZOMBIE)
-                                break;
-
-                        child->exit_code = SIGKILL;
-
-                        /* Deconfigure single-step and h/w bp. */
-                        ptrace_disable(child);
-
-                        /* TODO: make sure any pending breakpoint is killed */
-                        wake_up_process(child);
-                        break;
-
-                /* Set the trap flag. */
-                case PTRACE_SINGLESTEP: {
-                        unsigned long tmp;
-                        ret = -EIO;
-
-                        /* Set up SPC if not set already (in which case we have
-                           no other choice but to trust it). */
-                        if (!get_reg(child, PT_SPC)) {
-                                /* In case we're stopped in a delay slot. */
-                                tmp = get_reg(child, PT_ERP) & ~1;
-                                put_reg(child, PT_SPC, tmp);
-                        }
-                        tmp = get_reg(child, PT_CCS) | SBIT_USER;
-                        put_reg(child, PT_CCS, tmp);
-
-                        if (!valid_signal(data))
-                                break;
-
-                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-
-                        /* TODO: set some clever breakpoint mechanism... */
-
-                        child->exit_code = data;
-                        wake_up_process(child);
-                        ret = 0;
-                        break;
-
-                }
-
                 /* Get all GP registers from the child. */
                 case PTRACE_GETREGS: {
                         int i;
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 372d0ca6efbc..0b7e3f143281 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -4,6 +4,7 @@
 
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
 #include <linux/errno.h>