stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>,
	Hirokazu Takata <takata@linux-m32r.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Ben Hutchings <ben@decadent.org.uk>
Subject: [ 17/19] m32r: add memcpy() for CONFIG_KERNEL_GZIP=y
Date: Thu, 12 Sep 2013 10:26:26 -0700	[thread overview]
Message-ID: <20130912172526.030593512@linuxfoundation.org> (raw)
In-Reply-To: <20130912172524.135620246@linuxfoundation.org>

3.0-stable review patch.  If anyone has any objections, please let me know.

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

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

commit a8abbca6617e1caa2344d2d38d0a35f3e5928b79 upstream.

Fix the m32r link error:

    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'
  make[5]: *** [arch/m32r/boot/compressed/vmlinux] Error 1

by adding our own implementation of memcpy().

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>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/m32r/boot/compressed/misc.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- 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
 #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



  parent reply	other threads:[~2013-09-12 17:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-12 17:26 [ 00/19] 3.0.96-stable review Greg Kroah-Hartman
2013-09-12 17:26 ` [ 01/19] htb: fix sign extension bug Greg Kroah-Hartman
2013-09-12 17:26 ` [ 02/19] net: check net.core.somaxconn sysctl values Greg Kroah-Hartman
2013-09-12 17:26 ` [ 03/19] fib_trie: remove potential out of bound access Greg Kroah-Hartman
2013-09-12 17:26 ` [ 04/19] tcp: cubic: fix overflow error in bictcp_update() Greg Kroah-Hartman
2013-09-12 17:26 ` [ 05/19] tcp: cubic: fix bug in bictcp_acked() Greg Kroah-Hartman
2013-09-12 17:26 ` [ 06/19] ipv6: dont stop backtracking in fib6_lookup_1 if subtree does not match Greg Kroah-Hartman
2013-09-12 17:26 ` [ 07/19] tun: signedness bug in tun_get_user() Greg Kroah-Hartman
2013-09-12 17:26 ` [ 08/19] ipv6: remove max_addresses check from ipv6_create_tempaddr Greg Kroah-Hartman
2013-09-12 17:26 ` [ 09/19] ipv6: drop packets with multiple fragmentation headers Greg Kroah-Hartman
2013-09-12 17:26 ` [ 10/19] ipv6: Dont depend on per socket memory for neighbour discovery messages Greg Kroah-Hartman
2013-09-12 17:26 ` [ 11/19] net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay Greg Kroah-Hartman
2013-09-12 17:26 ` [ 12/19] ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO Greg Kroah-Hartman
2013-09-12 17:26 ` [ 13/19] tipc: fix lockdep warning during bearer initialization Greg Kroah-Hartman
2013-09-12 17:26 ` [ 14/19] PARISC: include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h Greg Kroah-Hartman
2013-09-12 17:26 ` [ 15/19] pci: frv architecture needs generic setup-bus infrastructure Greg Kroah-Hartman
2013-09-12 17:26 ` [ 16/19] m32r: consistently use "suffix-$(...)" Greg Kroah-Hartman
2013-09-12 17:26 ` Greg Kroah-Hartman [this message]
2013-09-12 17:26 ` [ 18/19] m32r: make memset() global for CONFIG_KERNEL_BZIP2=y Greg Kroah-Hartman
2013-09-12 17:26 ` [ 19/19] KVM: s390: move kvm_guest_enter,exit closer to sie Greg Kroah-Hartman
2013-09-12 22:29 ` [ 00/19] 3.0.96-stable review Guenter Roeck
2013-09-12 23:07   ` Greg Kroah-Hartman
2013-09-13 23:04 ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130912172526.030593512@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=ben@decadent.org.uk \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=takata@linux-m32r.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).