From 26550a76ae30cae1cc0ada4e798dac9cbd0ff201 Mon Sep 17 00:00:00 2001 From: Venkatesh Pallipadi Date: Mon, 18 Oct 2004 18:08:16 -0700 Subject: [PATCH] Fix EDID_INFO in zero-page EDID_INFO is encroaching on the space meant for E820 map in zero-page. This will result in E820 map corruption on any system that has more=20 than 18 E820 entries and CONFIG_VIDEO_SELECT. Not sure how this bug=20 managed to hide for more than a year. Attached patch should fix the bug. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-i386/setup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h index 59f4a1ad3a49..8814b54c75d4 100644 --- a/include/asm-i386/setup.h +++ b/include/asm-i386/setup.h @@ -55,7 +55,7 @@ extern unsigned char boot_params[PARAM_SIZE]; #define KERNEL_START (*(unsigned long *) (PARAM+0x214)) #define INITRD_START (*(unsigned long *) (PARAM+0x218)) #define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c)) -#define EDID_INFO (*(struct edid_info *) (PARAM+0x440)) +#define EDID_INFO (*(struct edid_info *) (PARAM+0x140)) #define EDD_NR (*(unsigned char *) (PARAM+EDDNR)) #define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF)) #define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF)) -- cgit v1.2.3