[Fedora-xen] Re: [Xen-ia64-devel] Re: Fedora-xen-ia64 test status

[Juan Quintela]

On Fri, 2006-08-04 at 11:30 +0900, Isaku Yamahata wrote:

Hi Isaku

I had already commited old Aron version of the patch

> However a bug was there. Here is the updated one.
> 
> - removed debug print.
> - bug fix. Extents at the end can be discarded.

I removed only one of the prink's sets :)
Could you confirm that my patch on top of the old one does what you
intend?  The only functional change that I found was that the change of
possition of the num -= colllapsed line, and I agree with the change :)

Later, Juan.
-------------- next part --------------
# HG changeset patch
# User quintela at elfo.mitica
# Node ID 43c220d8530c5a705dafb6539f24a7994f56fe73
# Parent  73cf9760b6d1b93722e163f920005c465f1b49f6

Fix typo on previous version of sort_regions() (ia64 xen)

Ack-by: Juan Quintela <quintela at redhat.com>
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>

diff -r 73cf9760b6d1 -r 43c220d8530c arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c	Fri Aug 11 16:36:02 2006 +0200
+++ b/arch/ia64/kernel/setup.c	Fri Aug 11 17:11:19 2006 +0200
@@ -231,11 +231,6 @@ sort_regions (struct rsvd_region *rsvd_r
 		}
 	}
 
-	for (j = 0; j < num; j++) {
-		printk("rsvd_region[%d]: [0x%016lx, 0x%06lx)\n",
-		       j, rsvd_region[j].start, rsvd_region[j].end);
-	}
-
 	for (j = 0; j < num - 1; j++) {
 		int k;
 		unsigned long start = rsvd_region[j].start;
@@ -250,15 +245,14 @@ sort_regions (struct rsvd_region *rsvd_r
 			}
 			end = max(end, rsvd_region[k].end);
 		}
-		if (k == num) {
+		if (k == num)
 			k--;
-		}
 		rsvd_region[j].end = end;
 		collapsed = k - j;
+		num -= collapsed;
 		for (k = j + 1; k < j + 1 + collapsed; k++) {
 			rsvd_region[k] = rsvd_region[k + collapsed];
 		}
-		num -= collapsed;
 	}
 
 	num_rsvd_regions = num;