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.

diff --git a/ChangeLog b/ChangeLog
index cda79b44a6abdad8d868b40f5ef273912c8d0ed4..41241e7a03b0230535cd16bdb27e039f46663043 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/lib/efi/relocator.c (grub_relocator_firmware_fill_events):

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 84cf1a17f105546953b42affcf78cf7d1f9b586b..08cdcda37e2d3da7c72071b5593ddf1d7a763233 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -252,7 +252,7 @@ struct grub_e820_mmap
 #define GRUB_E820_RESERVED   2
 #define GRUB_E820_ACPI       3
 #define GRUB_E820_NVS        4
-#define GRUB_E820_EXEC_CODE  5
+#define GRUB_E820_BADRAM     5
 
 static void
 generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 95aa6b4562ffc61f054aae9f002efd12339e0023..ca88c7403ec4eff6ce05b421a3d8ca8dced3f4e3 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -418,9 +418,9 @@ grub_linux_boot (void)
                                addr, size, GRUB_E820_NVS);
          break;
 
-        case GRUB_MEMORY_CODE:
+        case GRUB_MEMORY_BADRAM:
          grub_e820_add_region (params->e820_map, &e820_num,
-                               addr, size, GRUB_E820_EXEC_CODE);
+                               addr, size, GRUB_E820_BADRAM);
          break;
 
         default:

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 63f99db62d37ad203906a987cdcba10aa680c00b..9ba83eee21c9d6b095c2b7826c8828353f818c4f 100644 (file)
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -68,7 +68,7 @@
 #define GRUB_E820_RESERVED   2
 #define GRUB_E820_ACPI       3
 #define GRUB_E820_NVS        4
-#define GRUB_E820_EXEC_CODE  5
+#define GRUB_E820_BADRAM     5
 
 #define GRUB_E820_MAX_ENTRY  128