---

yaml --- r: 310929 b: refs/heads/master c: 58b7b53 h: refs/heads/master i: 310927: 81c1949 v: v3
git-mirror · May 30, 2012 · e2be688 · e2be688
1 parent 81848de
commit e2be688
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 780dbcd0eedec6528d777b668019dabb36badf1a
+refs/heads/master: 58b7b53a36b0be8081fbfc91aeea24b83c20ca1b
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -371,7 +371,8 @@ char * __init xen_memory_setup(void)
 	populated = xen_populate_chunk(map, memmap.nr_entries,
 			max_pfn, &last_pfn, xen_released_pages);
 
-	extra_pages += (xen_released_pages - populated);
+	xen_released_pages -= populated;
+	extra_pages += xen_released_pages;
 
 	if (last_pfn > max_pfn) {
 		max_pfn = min(MAX_DOMAIN_PAGES, last_pfn);