| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1298742844-8256-3-git-send-email-brgerst@gmail.com> Date: Sat, 26 Feb 2011 12:54:03 -0500 From: Brian Gerst <brgerst@...il.com> To: hpa@...or.com Cc: x86@...nel.org, linux-kernel@...r.kernel.org Subject: [PATCH 2/3] x86, boot: Remove memptr Use unsigned long for free memory pointers for both 32-bit and 64-bit. Signed-off-by: Brian Gerst <brgerst@...il.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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists