mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
To: linux@arm.linux.org.uk, nicolas.pitre@linaro.org,
	tony@atomide.com, s.hauer@pengutronix.de, magnus.damm@gmail.com,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Subject: [PATCH 1/2] ARM: remove memmove from boot/compressed/string.c
Date: Thu, 16 Feb 2012 15:54:16 +0100	[thread overview]
Message-ID: <1329404057-26346-2-git-send-email-michael.opdenacker@free-electrons.com> (raw)
In-Reply-To: <1329404057-26346-1-git-send-email-michael.opdenacker@free-electrons.com>

This patch removes the memmove function from boot/compressed/string.c
- This definition conflicts with the one in lib/decompress_unxz.c
  This change is required to support xz compression on ARM.
- memmove is not used in any of the other decompressors
  in lib/decompress_*.c

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
---
 arch/arm/boot/compressed/string.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c
index 36e53ef..369443a 100644
--- a/arch/arm/boot/compressed/string.c
+++ b/arch/arm/boot/compressed/string.c
@@ -40,6 +40,7 @@ void *memcpy(void *__dest, __const void *__src, size_t __n)
 	return __dest;
 }
 
+/*
 void *memmove(void *__dest, __const void *__src, size_t count)
 {
 	unsigned char *d = __dest;
@@ -55,6 +56,7 @@ void *memmove(void *__dest, __const void *__src, size_t count)
 		d[count] = s[count];
 	return __dest;
 }
+*/
 
 size_t strlen(const char *s)
 {
-- 
1.7.4.1


  reply	other threads:[~2012-02-16 14:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-16 14:54 ARM: add xz kernel compression support Michael Opdenacker
2012-02-16 14:54 ` Michael Opdenacker [this message]
2012-02-16 15:09   ` [PATCH 1/2] ARM: remove memmove from boot/compressed/string.c Jean-Christophe PLAGNIOL-VILLARD
2012-02-16 15:24     ` Michael Opdenacker
2012-02-16 17:44   ` Nicolas Pitre
2012-02-16 14:54 ` [PATCH 2/2] ARM: add support for xz kernel decompression Michael Opdenacker
     [not found]   ` <CAGvbF3KGYkye8z_gcpq20W+j+TugwkX0xjjHcbNf5jwibi_cRQ@mail.gmail.com>
2012-02-16 15:33     ` Michael Opdenacker
2012-02-16 15:37 ` ARM: add xz kernel compression support Veli-Pekka Peltola
2012-02-16 15:48   ` Michael Opdenacker
2012-02-16 15:55 ` Russell King - ARM Linux
2012-02-16 16:03   ` Michael Opdenacker

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=1329404057-26346-2-git-send-email-michael.opdenacker@free-electrons.com \
    --to=michael.opdenacker@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=magnus.damm@gmail.com \
    --cc=nicolas.pitre@linaro.org \
    --cc=s.hauer@pengutronix.de \
    --cc=tony@atomide.com \
    /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

all inboxes | Powered by JetHome®