lkml.org 
[lkml]   [2010]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 30/43] ptrace, parisc: change signature of arch_ptrace()
    Date
    change type of @addr and @data into unsigned long according to commit
    f76671df26ef06321480e702770f88f61272be29 [PATCH 03/43]

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Helge Deller <deller@gmx.de>
    Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
    ---
    arch/parisc/kernel/ptrace.c | 13 +++++++------
    1 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
    index c4f49e4..2905b1f 100644
    --- a/arch/parisc/kernel/ptrace.c
    +++ b/arch/parisc/kernel/ptrace.c
    @@ -110,7 +110,8 @@ void user_enable_block_step(struct task_struct *task)
    pa_psw(task)->l = 0;
    }

    -long arch_ptrace(struct task_struct *child, long request, long addr, long data)
    +long arch_ptrace(struct task_struct *child, long request,
    + unsigned long addr, unsigned long data)
    {
    unsigned long tmp;
    long ret = -EIO;
    @@ -120,11 +121,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
    /* Read the word at location addr in the USER area. For ptraced
    processes, the kernel saves all regs on a syscall. */
    case PTRACE_PEEKUSR:
    - if ((addr & (sizeof(long)-1)) ||
    - (unsigned long) addr >= sizeof(struct pt_regs))
    + if ((addr & (sizeof(unsigned long)-1)) ||
    + addr >= sizeof(struct pt_regs))
    break;
    tmp = *(unsigned long *) ((char *) task_regs(child) + addr);
    - ret = put_user(tmp, (unsigned long *) data);
    + ret = put_user(tmp, (unsigned long __user *) data);
    break;

    /* Write the word at location addr in the USER area. This will need
    @@ -151,8 +152,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
    break;
    }

    - if ((addr & (sizeof(long)-1)) ||
    - (unsigned long) addr >= sizeof(struct pt_regs))
    + if ((addr & (sizeof(unsigned long)-1)) ||
    + addr >= sizeof(struct pt_regs))
    break;
    if ((addr >= PT_GR1 && addr <= PT_GR31) ||
    addr == PT_IAOQ0 || addr == PT_IAOQ1 ||
    --
    1.7.2.2


    \
     
     \ /
      Last update: 2010-08-27 11:47    [W:0.023 / U:0.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site