The patch titled
Subject: m32r: fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
has been removed from the -mm tree. Its filename was
m32r-fix-fix-breakage-from-m32r-use-generic-ptrace_resume-code-fallout.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Subject: m32r: fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
acdc0d5ef9dd ('m32r: fix breakage from "m32r: use generic ptrace_resume
code"') tried to fix 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@xxxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Hirokazu Takata <takata@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/m32r/kernel/ptrace.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff -puN arch/m32r/kernel/ptrace.c~m32r-fix-fix-breakage-from-m32r-use-generic-ptrace_resume-code-fallout arch/m32r/kernel/ptrace.c
--- a/arch/m32r/kernel/ptrace.c~m32r-fix-fix-breakage-from-m32r-use-generic-ptrace_resume-code-fallout
+++ a/arch/m32r/kernel/ptrace.c
@@ -591,17 +591,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)
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
linux-next.patch
mn10300-only-add-mmem-funcs-to-kbuild_cflags-if-gcc-supports-it.patch
frv-kill-used-but-uninitialized-variable.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
