commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[1917] Add #error instance with comment to explain why this


From: Robert Millan
Subject: [1917] Add #error instance with comment to explain why this
Date: Fri, 14 Nov 2008 20:18:08 +0000

Revision: 1917
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1917
Author:   robertmh
Date:     2008-11-14 20:18:07 +0000 (Fri, 14 Nov 2008)

Log Message:
-----------
        Add #error instance with comment to explain why this
        loader isn't currently usable on PC/BIOS.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/linux.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-11-14 20:08:47 UTC (rev 1916)
+++ trunk/grub2/ChangeLog       2008-11-14 20:18:07 UTC (rev 1917)
@@ -14,7 +14,8 @@
        an appropiate place in lower memory, between 0x10000 and 0x90000,
        like loader/i386/efi/linux.c does.  Linux often panics if real_mode_mem
        is in our heap (probably as a result of it being corrupted during
-       decompression).
+       decompression).  Add #error instance with comment to explain why this
+       loader isn't currently usable on PC/BIOS.
 
 2008-11-14  Robert Millan  <address@hidden>
 

Modified: trunk/grub2/loader/i386/linux.c
===================================================================
--- trunk/grub2/loader/i386/linux.c     2008-11-14 20:08:47 UTC (rev 1916)
+++ trunk/grub2/loader/i386/linux.c     2008-11-14 20:18:07 UTC (rev 1917)
@@ -17,6 +17,7 @@
  */
 
 #include <grub/loader.h>
+#include <grub/machine/machine.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/loader.h>
 #include <grub/file.h>
@@ -142,6 +143,12 @@
   real_mode_mem = 0;
   prot_mode_mem = 0;
   
+  /* i386-pc port adds lower memory to heap, which collides with
+     `real_mode_mem' allocation below.  */
+#ifdef GRUB_MACHINE_PCBIOS
+#error
+#endif
+
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, 
grub_uint32_t type)
     {






reply via email to

[Prev in Thread] Current Thread [Next in Thread]