From 5618afbf598e3f212e3d50381fbc1eaa6eea7ec3 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Mon, 3 Sep 2007 20:33:20 +0000
Subject: [PATCH] 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.
---
 ChangeLog           | 6 ++++++
 THANKS              | 1 +
 kern/i386/pc/init.c | 1 +
 3 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7f8c41286..eae17a6b3 100644
--- 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 d43d6db72..445bb6f0d 100644
--- 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 64882e33f..90abd9537 100644
--- 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--;
       }
 }