diff --git a/[refs] b/[refs]
index 846394f5966b..7c29a6e117a6 100644
--- 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
index d7bd1b323775..d6886d90ccfd 100644
--- 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++)