From aa2d5f2c13134816d14927841c680ebd63f1fb6f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 17 Oct 2012 09:39:16 +0100 Subject: [PATCH] --- yaml --- r: 334791 b: refs/heads/master c: 965c0aaafe3e75d4e65cd4ec862915869bde3abd h: refs/heads/master i: 334789: 37dcb9df13bbea389487daff7ba2af92eb5bda1a 334787: 4e67b21df92ae2b26b9fe4ead1453059c73f783d 334783: 95c713b594169eb31ac93f95cfe2cfaffec4d224 v: v3 --- [refs] | 2 +- trunk/drivers/xen/balloon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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++)