* [PATCH 2/6] m32r: Fix pull clearing RESTORE_SIGMASK into block_sigmask() fallout
2012-07-13 21:20 [PATCH 1/6] m32r: Remove duplicate definition of PTRACE_O_TRACESYSGOOD Geert Uytterhoeven
@ 2012-07-13 21:20 ` Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 3/6] m32r: Fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout Geert Uytterhoeven
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2012-07-13 21:20 UTC (permalink / raw)
To: Hirokazu Takata, Andrew Morton
Cc: linux-m32r, linux-kernel, Geert Uytterhoeven, Al Viro
commit a610d6e672d6d3723e8da257ad4a8a288a8f2f89 ("pull clearing
RESTORE_SIGMASK into block_sigmask()") caused:
arch/m32r/kernel/signal.c: In function 'handle_signal':
arch/m32r/kernel/signal.c:289:6: warning: 'return' with a value, in function returning void [enabled by default]
Remove the return value it forgot to remove.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
---
arch/m32r/kernel/signal.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index f3fb2c0..d0f60b9 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -286,7 +286,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
case -ERESTARTNOINTR:
regs->r0 = regs->orig_r0;
if (prev_insn(regs) < 0)
- return -EFAULT;
+ return;
}
}
--
1.7.0.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/6] m32r: Fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
2012-07-13 21:20 [PATCH 1/6] m32r: Remove duplicate definition of PTRACE_O_TRACESYSGOOD Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 2/6] m32r: Fix pull clearing RESTORE_SIGMASK into block_sigmask() fallout Geert Uytterhoeven
@ 2012-07-13 21:20 ` Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 4/6] m32r: Consistently use "suffix-$(...)" Geert Uytterhoeven
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2012-07-13 21:20 UTC (permalink / raw)
To: Hirokazu Takata, Andrew Morton
Cc: linux-m32r, linux-kernel, Geert Uytterhoeven, Al Viro, Christoph Hellwig
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/6] m32r: Consistently use "suffix-$(...)"
2012-07-13 21:20 [PATCH 1/6] m32r: Remove duplicate definition of PTRACE_O_TRACESYSGOOD Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 2/6] m32r: Fix pull clearing RESTORE_SIGMASK into block_sigmask() fallout Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 3/6] m32r: Fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout Geert Uytterhoeven
@ 2012-07-13 21:20 ` Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 5/6] m32r: Add memcpy() for CONFIG_KERNEL_GZIP=y Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 6/6] m32r: Make memset() global for CONFIG_KERNEL_BZIP2=y Geert Uytterhoeven
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2012-07-13 21:20 UTC (permalink / raw)
To: Hirokazu Takata, Andrew Morton
Cc: linux-m32r, linux-kernel, Geert Uytterhoeven
commit a556bec9955c8e47b40a87dbfeef6f24d3b2228f ("m32r: fix
arch/m32r/boot/compressed/Makefile") changed "$(suffix_y)" to
"$(suffix-y)", but didn't update any location where "suffix_y" is set,
causing:
make[5]: *** No rule to make target `arch/m32r/boot/compressed/vmlinux.bin.', needed by `arch/m32r/boot/compressed/piggy.o'. Stop.
make[4]: *** [arch/m32r/boot/compressed/vmlinux] Error 2
make[3]: *** [zImage] Error 2
Correct the other locations to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m32r/boot/compressed/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile
index 177716b..01729c2 100644
--- a/arch/m32r/boot/compressed/Makefile
+++ b/arch/m32r/boot/compressed/Makefile
@@ -43,9 +43,9 @@ endif
OBJCOPYFLAGS += -R .empty_zero_page
-suffix_$(CONFIG_KERNEL_GZIP) = gz
-suffix_$(CONFIG_KERNEL_BZIP2) = bz2
-suffix_$(CONFIG_KERNEL_LZMA) = lzma
+suffix-$(CONFIG_KERNEL_GZIP) = gz
+suffix-$(CONFIG_KERNEL_BZIP2) = bz2
+suffix-$(CONFIG_KERNEL_LZMA) = lzma
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
$(call if_changed,ld)
--
1.7.0.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 5/6] m32r: Add memcpy() for CONFIG_KERNEL_GZIP=y
2012-07-13 21:20 [PATCH 1/6] m32r: Remove duplicate definition of PTRACE_O_TRACESYSGOOD Geert Uytterhoeven
` (2 preceding siblings ...)
2012-07-13 21:20 ` [PATCH 4/6] m32r: Consistently use "suffix-$(...)" Geert Uytterhoeven
@ 2012-07-13 21:20 ` Geert Uytterhoeven
2012-07-13 21:20 ` [PATCH 6/6] m32r: Make memset() global for CONFIG_KERNEL_BZIP2=y Geert Uytterhoeven
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2012-07-13 21:20 UTC (permalink / raw)
To: Hirokazu Takata, Andrew Morton
Cc: linux-m32r, linux-kernel, Geert Uytterhoeven
LD arch/m32r/boot/compressed/vmlinux
arch/m32r/boot/compressed/misc.o: In function `zlib_updatewindow':
misc.c:(.text+0x190): undefined reference to `memcpy'
misc.c:(.text+0x190): relocation truncated to fit: R_M32R_26_PLTREL against undefined symbol `memcpy'
misc.c:(.text+0x1e0): undefined reference to `memcpy'
misc.c:(.text+0x1e0): relocation truncated to fit: R_M32R_26_PLTREL against undefined symbol `memcpy'
misc.c:(.text+0x218): undefined reference to `memcpy'
misc.c:(.text+0x218): relocation truncated to fit: R_M32R_26_PLTREL against undefined symbol `memcpy'
arch/m32r/boot/compressed/misc.o: In function `zlib_inflate':
misc.c:(.text+0x171c): undefined reference to `memcpy'
misc.c:(.text+0x171c): relocation truncated to fit: R_M32R_26_PLTREL against undefined symbol `memcpy'
make[5]: *** [arch/m32r/boot/compressed/vmlinux] Error 1
Add our own implementation of memcpy() to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m32r/boot/compressed/misc.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c
index 370d608..3147aa2 100644
--- a/arch/m32r/boot/compressed/misc.c
+++ b/arch/m32r/boot/compressed/misc.c
@@ -39,6 +39,16 @@ static void *memset(void *s, int c, size_t n)
#endif
#ifdef CONFIG_KERNEL_GZIP
+void *memcpy(void *dest, const void *src, size_t n)
+{
+ char *d = dest;
+ const char *s = src;
+ while (n--)
+ *d++ = *s++;
+
+ return dest;
+}
+
#define BOOT_HEAP_SIZE 0x10000
#include "../../../../lib/decompress_inflate.c"
#endif
--
1.7.0.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 6/6] m32r: Make memset() global for CONFIG_KERNEL_BZIP2=y
2012-07-13 21:20 [PATCH 1/6] m32r: Remove duplicate definition of PTRACE_O_TRACESYSGOOD Geert Uytterhoeven
` (3 preceding siblings ...)
2012-07-13 21:20 ` [PATCH 5/6] m32r: Add memcpy() for CONFIG_KERNEL_GZIP=y Geert Uytterhoeven
@ 2012-07-13 21:20 ` Geert Uytterhoeven
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2012-07-13 21:20 UTC (permalink / raw)
To: Hirokazu Takata, Andrew Morton
Cc: linux-m32r, linux-kernel, Geert Uytterhoeven
arch/m32r/boot/compressed/misc.c:31:14: error: static declaration of 'memset' follows non-static declaration
make[5]: *** [arch/m32r/boot/compressed/misc.o] Error 1
make[4]: *** [arch/m32r/boot/compressed/vmlinux] Error 2
Remove the static keyword to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m32r/boot/compressed/misc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c
index 3147aa2..28a0952 100644
--- a/arch/m32r/boot/compressed/misc.c
+++ b/arch/m32r/boot/compressed/misc.c
@@ -28,7 +28,7 @@ static unsigned long free_mem_ptr;
static unsigned long free_mem_end_ptr;
#ifdef CONFIG_KERNEL_BZIP2
-static void *memset(void *s, int c, size_t n)
+void *memset(void *s, int c, size_t n)
{
char *ss = s;
--
1.7.0.4
^ permalink raw reply [flat|nested] 6+ messages in thread