* grub-core/loader/i386/linux.c (allocate_pages): Don't allocate

	beyond 4 GiB.
	(grub_cmd_linux): Use GRUB_LINUX_BZIMAGE_ADDR for non-relocatable
	images independently of preffered adderss field.

diff --git a/ChangeLog b/ChangeLog
index 9c715594ce907d8921bec9e8a2b88887104f7470..dc7f7c6308ca07dccdc5abab631d8ca2b8488361 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/linux.c (allocate_pages): Don't allocate
+       beyond 4 GiB.
+       (grub_cmd_linux): Use GRUB_LINUX_BZIMAGE_ADDR for non-relocatable
+       images independently of preffered adderss field.
+
 2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/i386/pc/play.c: Improve TRANSLATORS comments.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 13e880f6b656e6a1c0d13a0a8abacc978d267315..8a4c9896b8ff9120bd400624fbd23d8fe4dfa907 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -294,7 +294,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
          {
            grub_errno = GRUB_ERR_NONE;
            err = grub_relocator_alloc_chunk_align (relocator, &ch,
-                                                   0x1000000, 0xffffffff,
+                                                   0x1000000,
+                                                   0xffffffff & ~prot_size,
                                                    prot_size, 1 << *align,
                                                    GRUB_RELOCATOR_PREFERENCE_LOW,
                                                    1);
@@ -759,7 +760,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       min_align = lh.min_alignment;
       prot_size = grub_le_to_cpu32 (lh.init_size);
       prot_init_space = page_align (prot_size);
-      preffered_address = grub_le_to_cpu64 (lh.pref_address);
+      if (relocatable)
+       preffered_address = grub_le_to_cpu64 (lh.pref_address);
+      else
+       preffered_address = GRUB_LINUX_BZIMAGE_ADDR;
     }
   else
     {