aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2010-02-05 09:37:07 -0500
committerH. Peter Anvin <hpa@zytor.com>2010-02-05 16:57:33 -0500
commit6175ddf06b6172046a329e3abfd9c901a43efd2e (patch)
treed721460533e8a4b083f5eeec8f0f5a2ec2062315 /arch/x86/boot
parent2b4df4d4f7de1a834d252c7da3197fce634cbf0e (diff)
x86: Clean up mem*io functions.
Iomem has no special significance on x86. Use the standard mem* functions instead of trying to call other versions. Some fixups are needed to match the function prototypes. Signed-off-by: Brian Gerst <brgerst@gmail.com> LKML-Reference: <1265380629-3212-6-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/misc.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 3b22fe8ab91b..88042e812d3c 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -19,11 +19,6 @@
19#define _ASM_X86_DESC_H 1 19#define _ASM_X86_DESC_H 1
20#endif 20#endif
21 21
22#ifdef CONFIG_X86_64
23#define _LINUX_STRING_H_ 1
24#define __LINUX_BITMAP_H 1
25#endif
26
27#include <linux/linkage.h> 22#include <linux/linkage.h>
28#include <linux/screen_info.h> 23#include <linux/screen_info.h>
29#include <linux/elf.h> 24#include <linux/elf.h>
@@ -131,8 +126,8 @@ static void error(char *m);
131static struct boot_params *real_mode; /* Pointer to real-mode data */ 126static struct boot_params *real_mode; /* Pointer to real-mode data */
132static int quiet; 127static int quiet;
133 128
134static void *memset(void *s, int c, unsigned n); 129void *memset(void *s, int c, size_t n);
135void *memcpy(void *dest, const void *src, unsigned n); 130void *memcpy(void *dest, const void *src, size_t n);
136 131
137static void __putstr(int, const char *); 132static void __putstr(int, const char *);
138#define putstr(__x) __putstr(0, __x) 133#define putstr(__x) __putstr(0, __x)
@@ -223,7 +218,7 @@ static void __putstr(int error, const char *s)
223 outb(0xff & (pos >> 1), vidport+1); 218 outb(0xff & (pos >> 1), vidport+1);
224} 219}
225 220
226static void *memset(void *s, int c, unsigned n) 221void *memset(void *s, int c, size_t n)
227{ 222{
228 int i; 223 int i;
229 char *ss = s; 224 char *ss = s;
@@ -233,7 +228,7 @@ static void *memset(void *s, int c, unsigned n)
233 return s; 228 return s;
234} 229}
235 230
236void *memcpy(void *dest, const void *src, unsigned n) 231void *memcpy(void *dest, const void *src, size_t n)
237{ 232{
238 int i; 233 int i;
239 const char *s = src; 234 const char *s = src;