---

yaml --- r: 334791 b: refs/heads/master c: 965c0aa h: refs/heads/master i: 334789: 37dcb9d 334787: 4e67b21 334783: 95c713b v: v3
git-mirror · Oct 19, 2012 · aa2d5f2 · aa2d5f2
1 parent 9d2e4ee
commit aa2d5f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a349e23d1cf746f8bdc603dcc61fae9ee4a695f6
+refs/heads/master: 965c0aaafe3e75d4e65cd4ec862915869bde3abd
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
@@ -87,7 +87,7 @@ struct balloon_stats balloon_stats;
 EXPORT_SYMBOL_GPL(balloon_stats);
 
 /* We increase/decrease in batches which fit in a page */
-static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
+static xen_pfn_t frame_list[PAGE_SIZE / sizeof(unsigned long)];
 
 #ifdef CONFIG_HIGHMEM
 #define inc_totalhigh_pages() (totalhigh_pages++)