From 018b209ca7bd1a7e5e4bd8b6f8c8cc3ed85dc61e Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Wed, 27 Oct 2010 15:33:51 -0700 Subject: [PATCH] --- yaml --- r: 218543 b: refs/heads/master c: aeebd3a3d9f5b67a254f04e6eac91a74c5e1065e h: refs/heads/master i: 218541: 6e7e09cb47e2c645f2b20cf0932f5227feeb9ad7 218539: eaa77c84f00e32384c3e2c0fcebca60d6c3198e0 218535: 9a5acaf958e2b587c50e99738f2a1b2824cded7a 218527: 7fc77a1f7c7eefc0428005faace89b9d8f70d056 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/ptrace.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 034f8bb28391..0370a016d16e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f29b8fb416a0ad49d5077ab10ed780efdfcb126 +refs/heads/master: aeebd3a3d9f5b67a254f04e6eac91a74c5e1065e diff --git a/trunk/arch/blackfin/kernel/ptrace.c b/trunk/arch/blackfin/kernel/ptrace.c index 8e3083ccd88a..75089f80855d 100644 --- a/trunk/arch/blackfin/kernel/ptrace.c +++ b/trunk/arch/blackfin/kernel/ptrace.c @@ -38,12 +38,13 @@ * Get contents of register REGNO in task TASK. */ static inline long -get_reg(struct task_struct *task, long regno, unsigned long __user *datap) +get_reg(struct task_struct *task, unsigned long regno, + unsigned long __user *datap) { long tmp; struct pt_regs *regs = task_pt_regs(task); - if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0) + if (regno & 3 || regno > PT_LAST_PSEUDO) return -EIO; switch (regno) { @@ -74,11 +75,11 @@ get_reg(struct task_struct *task, long regno, unsigned long __user *datap) * Write contents of register REGNO in task TASK. */ static inline int -put_reg(struct task_struct *task, long regno, unsigned long data) +put_reg(struct task_struct *task, unsigned long regno, unsigned long data) { struct pt_regs *regs = task_pt_regs(task); - if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0) + if (regno & 3 || regno > PT_LAST_PSEUDO) return -EIO; switch (regno) { @@ -369,14 +370,14 @@ long arch_ptrace(struct task_struct *child, long request, return copy_regset_to_user(child, &user_bfin_native_view, REGSET_GENERAL, 0, sizeof(struct pt_regs), - (void __user *)data); + datap); case PTRACE_SETREGS: pr_debug("ptrace: PTRACE_SETREGS\n"); return copy_regset_from_user(child, &user_bfin_native_view, REGSET_GENERAL, 0, sizeof(struct pt_regs), - (const void __user *)data); + datap); case_default: default: