Messages in this thread Patch in this message | | | From | Brian Gerst <> | Subject | [PATCH 2/3] x86, boot: Remove memptr | Date | Sat, 26 Feb 2011 12:54:03 -0500 |
| |
Use unsigned long for free memory pointers for both 32-bit and 64-bit.
Signed-off-by: Brian Gerst <brgerst@gmail.com> --- arch/x86/boot/compressed/misc.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 2d57c97..c13b5e9 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -114,14 +114,8 @@ static int debug; void *memset(void *s, int c, size_t n); void *memcpy(void *dest, const void *src, size_t n); -#ifdef CONFIG_X86_64 -#define memptr long -#else -#define memptr unsigned -#endif - -static memptr free_mem_ptr; -static memptr free_mem_end_ptr; +static unsigned long free_mem_ptr; +static unsigned long free_mem_end_ptr; static char *vidmem; static int vidport; @@ -318,7 +312,7 @@ static void parse_elf(void *output) } } -asmlinkage void decompress_kernel(void *rmode, memptr heap, +asmlinkage void decompress_kernel(void *rmode, unsigned long heap, unsigned char *input_data, unsigned long input_len, unsigned char *output) -- 1.7.4
| |