You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19 lines
424 B
Diff
19 lines
424 B
Diff
10 years ago
|
--- a/arch/mips/boot/compressed/decompress.c
|
||
|
+++ b/arch/mips/boot/compressed/decompress.c
|
||
|
@@ -45,6 +45,7 @@ void error(char *x)
|
||
|
#define STATIC static
|
||
|
|
||
|
#ifdef CONFIG_KERNEL_GZIP
|
||
|
+#undef memcpy
|
||
|
void *memcpy(void *dest, const void *src, size_t n)
|
||
|
{
|
||
|
int i;
|
||
|
@@ -59,6 +60,7 @@ void *memcpy(void *dest, const void *src
|
||
|
#endif
|
||
|
|
||
|
#ifdef CONFIG_KERNEL_BZIP2
|
||
|
+#undef memset
|
||
|
void *memset(void *s, int c, size_t n)
|
||
|
{
|
||
|
int i;
|