lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 120/140] m32r: fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
    3.2.100-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Geert Uytterhoeven <geert@linux-m68k.org>

    commit a6b202979661eb32646048aeaad7be7b70c2cd22 upstream.

    Commit acdc0d5ef9dd ('m32r: fix breakage from "m32r: use generic
    ptrace_resume code"') tried to fix a problem in commit e34112e3966fc
    ("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>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/m32r/kernel/ptrace.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/arch/m32r/kernel/ptrace.c
    +++ b/arch/m32r/kernel/ptrace.c
    @@ -592,17 +592,16 @@ void user_enable_single_step(struct task

    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)
    \
     
     \ /
      Last update: 2018-02-28 18:40    [W:4.556 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site