From e2be68899d15c2fb098dd623bf7d5fc061eb825d Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 29 May 2012 12:36:43 -0400
Subject: [PATCH] --- yaml --- r: 310929 b: refs/heads/master c:
 58b7b53a36b0be8081fbfc91aeea24b83c20ca1b h: refs/heads/master i:   310927:
 81c1949553b938c1bf51c34ee28a88b72232f694 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/xen/setup.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 057e48cb137b..01e1322551d9 100644
--- 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
index 3ebba0753d38..a4790bf22c59 100644
--- 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);