2007-09-03 Yoshinori K. Okuji <okuji@enbug.org>

    From Hitoshi Ozeki:
    * kern/i386/pc/init.c (compact_mem_regions): Decrease NUM_REGIONS
    when merging two regions.

diff --git a/ChangeLog b/ChangeLog
index 7f8c412869de206b0e027c6e3c18f16feaf77f87..eae17a6b3d9155713e4b6c6b47c800180197946f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-03  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       From Hitoshi Ozeki:
+       * kern/i386/pc/init.c (compact_mem_regions): Decrease NUM_REGIONS
+       when merging two regions.
+
 2007-09-03  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * kern/rescue.c (grub_enter_rescue_mode): Free ARGS.

diff --git a/THANKS b/THANKS
index d43d6db72d16fd2e60de26391bfbf32c52cb8fcb..445bb6f0d20771c40cc3449545208267d7072bf0 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Andrey Shuvikov <mr_hyro@yahoo.com>
 Bibo Mao <bibo.mao@intel.com>
 Guillem Jover <guillem@hadrons.org>
 Harley D. Eades III <hde@foobar-qux.org>
+Hitoshi Ozeki <h-ozeki@ck2.so-net.ne.jp>
 Hollis Blanchard <hollis@penguinppc.org>
 Jeroen Dekkers <jeroen@dekkers.cx>
 Johan Rydberg <jrydberg@gnu.org>

diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 64882e33ff7549459d0c5e16ac8802c0fca05fa7..90abd95376f6305f35e211a08f751bd8d596961a 100644 (file)
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -120,6 +120,7 @@ compact_mem_regions (void)
        grub_memmove (mem_regions + j, mem_regions + j + 1,
                      (num_regions - j - 1) * sizeof (struct mem_region));
        i--;
+        num_regions--;
       }
 }