vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The E820 type 5 is BADRAM, not EXEC_CODE.

Browse source 
* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
	(GRUB_E820_BADRAM): New define.
	* grub-core/loader/i386/linux.c (grub_linux_boot): Translate code
	into reserved. Propagate BADRAM.
	* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
	(GRUB_E820_BADRAM): New define.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-05 01:14:32 +01:00
parent 9eae2084f4
commit 18a38098ad
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2011-01-05 Vladimir Serbinenko <phcoder@gmail.com>
The E820 type 5 is BADRAM, not EXEC_CODE.
* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
(GRUB_E820_BADRAM): New define.
* grub-core/loader/i386/linux.c (grub_linux_boot): Translate code
into reserved. Propagate BADRAM.
* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
(GRUB_E820_BADRAM): New define.
2011-01-04 Vladimir Serbinenko <phcoder@gmail.com> 2011-01-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/efi/relocator.c (grub_relocator_firmware_fill_events): * grub-core/lib/efi/relocator.c (grub_relocator_firmware_fill_events):

2
grub-core/loader/i386/bsd.c
View file

@ -252,7 +252,7 @@ struct grub_e820_mmap
#define GRUB_E820_RESERVED 2 #define GRUB_E820_RESERVED 2
#define GRUB_E820_ACPI 3 #define GRUB_E820_ACPI 3
#define GRUB_E820_NVS 4 #define GRUB_E820_NVS 4
#define GRUB_E820_EXEC_CODE 5 #define GRUB_E820_BADRAM 5
static void static void
generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf) generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)

4
grub-core/loader/i386/linux.c
View file

@ -418,9 +418,9 @@ grub_linux_boot (void)
addr, size, GRUB_E820_NVS); addr, size, GRUB_E820_NVS);
break; break;
case GRUB_MEMORY_CODE: case GRUB_MEMORY_BADRAM:
grub_e820_add_region (params->e820_map, &e820_num, grub_e820_add_region (params->e820_map, &e820_num,
addr, size, GRUB_E820_EXEC_CODE); addr, size, GRUB_E820_BADRAM);
break; break;
default: default:

2
include/grub/i386/linux.h
View file

@ -68,7 +68,7 @@
#define GRUB_E820_RESERVED 2 #define GRUB_E820_RESERVED 2
#define GRUB_E820_ACPI 3 #define GRUB_E820_ACPI 3
#define GRUB_E820_NVS 4 #define GRUB_E820_NVS 4
#define GRUB_E820_EXEC_CODE 5 #define GRUB_E820_BADRAM 5
#define GRUB_E820_MAX_ENTRY 128 #define GRUB_E820_MAX_ENTRY 128