diff options
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
-rw-r--r-- | arch/arm/boot/compressed/misc.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 832d37236c59..8e2a8fca5ed2 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
@@ -18,14 +18,9 @@ | |||
18 | 18 | ||
19 | unsigned int __machine_arch_type; | 19 | unsigned int __machine_arch_type; |
20 | 20 | ||
21 | #define _LINUX_STRING_H_ | ||
22 | |||
23 | #include <linux/compiler.h> /* for inline */ | 21 | #include <linux/compiler.h> /* for inline */ |
24 | #include <linux/types.h> /* for size_t */ | 22 | #include <linux/types.h> |
25 | #include <linux/stddef.h> /* for NULL */ | ||
26 | #include <linux/linkage.h> | 23 | #include <linux/linkage.h> |
27 | #include <asm/string.h> | ||
28 | |||
29 | 24 | ||
30 | static void putstr(const char *ptr); | 25 | static void putstr(const char *ptr); |
31 | extern void error(char *x); | 26 | extern void error(char *x); |
@@ -101,41 +96,6 @@ static void putstr(const char *ptr) | |||
101 | flush(); | 96 | flush(); |
102 | } | 97 | } |
103 | 98 | ||
104 | |||
105 | void *memcpy(void *__dest, __const void *__src, size_t __n) | ||
106 | { | ||
107 | int i = 0; | ||
108 | unsigned char *d = (unsigned char *)__dest, *s = (unsigned char *)__src; | ||
109 | |||
110 | for (i = __n >> 3; i > 0; i--) { | ||
111 | *d++ = *s++; | ||
112 | *d++ = *s++; | ||
113 | *d++ = *s++; | ||
114 | *d++ = *s++; | ||
115 | *d++ = *s++; | ||
116 | *d++ = *s++; | ||
117 | *d++ = *s++; | ||
118 | *d++ = *s++; | ||
119 | } | ||
120 | |||
121 | if (__n & 1 << 2) { | ||
122 | *d++ = *s++; | ||
123 | *d++ = *s++; | ||
124 | *d++ = *s++; | ||
125 | *d++ = *s++; | ||
126 | } | ||
127 | |||
128 | if (__n & 1 << 1) { | ||
129 | *d++ = *s++; | ||
130 | *d++ = *s++; | ||
131 | } | ||
132 | |||
133 | if (__n & 1) | ||
134 | *d++ = *s++; | ||
135 | |||
136 | return __dest; | ||
137 | } | ||
138 | |||
139 | /* | 99 | /* |
140 | * gzip declarations | 100 | * gzip declarations |
141 | */ | 101 | */ |