lkml.org 
[lkml]   [2012]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/6] m32r: Fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
    Date
    commit acdc0d5ef9dd74534fe8df77a2056fa1d911abe5 ('m32r: fix breakage from
    "m32r: use generic ptrace_resume code"') tried to fix commit
    e34112e3966fc466ced2698e6c196bb50b1ee20e ("m32r: use generic ptrace_resume
    code") by returning values in a function returning void, causing:

    arch/m32r/kernel/ptrace.c: In function 'user_enable_single_step':
    arch/m32r/kernel/ptrace.c:594:3: warning: 'return' with a value, in function returning void [enabled by default]
    arch/m32r/kernel/ptrace.c:598:3: warning: 'return' with a value, in function returning void [enabled by default]
    arch/m32r/kernel/ptrace.c:601:3: warning: 'return' with a value, in function returning void [enabled by default]
    arch/m32r/kernel/ptrace.c:604:2: warning: 'return' with a value, in function returning void [enabled by default]

    Remove the unneeded return values.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Christoph Hellwig <hch@lst.de>
    --
    Is this the correct fix? There's no way to propagate failures
    ---
    arch/m32r/kernel/ptrace.c | 7 +++----
    1 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
    index 4c03361..51f5e9a 100644
    --- a/arch/m32r/kernel/ptrace.c
    +++ b/arch/m32r/kernel/ptrace.c
    @@ -591,17 +591,16 @@ void user_enable_single_step(struct task_struct *child)

    if (access_process_vm(child, pc&~3, &insn, sizeof(insn), 0)
    != sizeof(insn))
    - return -EIO;
    + return;

    compute_next_pc(insn, pc, &next_pc, child);
    if (next_pc & 0x80000000)
    - return -EIO;
    + return;

    if (embed_debug_trap(child, next_pc))
    - return -EIO;
    + return;

    invalidate_cache();
    - return 0;
    }

    void user_disable_single_step(struct task_struct *child)
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-07-14 00:21    [W:0.024 / U:0.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site