* grub-core/loader/i386/linux.c (allocate_pages): Fix handling of the

	case when min_align = 0.

diff --git a/ChangeLog b/ChangeLog
index 719265ab445f427dcc32ba97a7dc0d95897ba1eb..341e64618d46933ab76f89f3431f38eb883158dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/linux.c (allocate_pages): Fix handling of the
+       case when min_align = 0.
+
 2012-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/normal/charset.c (bidi_line_wrap): Fix a spurious warning

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index df133c2cbfc4ebb655e90ee4b67d03fb37fec7ec..84896c27be7f19e81477a67aafb66a83081d91cc 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -289,7 +289,7 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
                                                prot_size, 1,
                                                GRUB_RELOCATOR_PREFERENCE_LOW,
                                                1);
-       for (; err && *align >= min_align; (*align)--)
+       for (; err && *align + 1 > min_align; (*align)--)
          {
            grub_errno = GRUB_ERR_NONE;
            err = grub_relocator_alloc_chunk_align (relocator, &ch,