diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-07-17 15:48:05 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-09-10 01:57:38 +0100 |
| commit | c9b5d71cd772004cf95683e7169e67ad5f1d5806 (patch) | |
| tree | 5dc2730856a817c1f2bfdb2037b277c161e6cc32 /arch/m32r | |
| parent | d2cd7ba97d9a22d88aaead8ce3f067c136b7530b (diff) | |
| download | lwn-c9b5d71cd772004cf95683e7169e67ad5f1d5806.tar.gz lwn-c9b5d71cd772004cf95683e7169e67ad5f1d5806.zip | |
m32r: make memset() global for CONFIG_KERNEL_BZIP2=y
commit 9a75c6e5240f7edc5955e8da5b94bde6f96070b3 upstream.
Fix the m32r compile error:
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
by removing the static keyword.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
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>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | 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 3147aa248b93..28a09529f206 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; |