---

yaml --- r: 275577 b: refs/heads/master c: 72e9cf2 h: refs/heads/master i: 275575: 430c2ba v: v3
git-mirror · Nov 16, 2011 · 8c50cf2 · 8c50cf2
1 parent 8292a88
commit 8c50cf2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f76d7078ce784916d55fc4e1bb0a42985f085a6
+refs/heads/master: 72e9cf2ab12ef3e050577ffebdb0c88a28df821d
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
@@ -501,7 +501,7 @@ EXPORT_SYMBOL_GPL(balloon_set_new_target);
  * alloc_xenballooned_pages - get pages that have been ballooned out
  * @nr_pages: Number of pages to get
  * @pages: pages returned
- * @highmem: highmem or lowmem pages
+ * @highmem: allow highmem pages
  * @return 0 on success, error otherwise
  */
 int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
@@ -511,7 +511,7 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
 	mutex_lock(&balloon_mutex);
 	while (pgno < nr_pages) {
 		page = balloon_retrieve(highmem);
-		if (page && PageHighMem(page) == highmem) {
+		if (page && (highmem || !PageHighMem(page))) {
 			pages[pgno++] = page;
 		} else {
 			enum bp_state st;