Index: head-2006-06-13/drivers/xen/balloon/balloon.c =================================================================== --- head-2006-06-13.orig/drivers/xen/balloon/balloon.c 2006-06-14 10:14:15.000000000 +0200 +++ head-2006-06-13/drivers/xen/balloon/balloon.c 2006-06-16 17:15:55.000000000 +0200 @@ -492,11 +492,20 @@ static int balloon_read(char *page, char page, "Current allocation: %8lu kB\n" "Requested target: %8lu kB\n" +#ifdef CONFIG_HIGHMEM "Low-mem balloon: %8lu kB\n" "High-mem balloon: %8lu kB\n" +#else + "Balloon: %8lu kB\n" +#endif "Xen hard limit: ", PAGES2KB(current_pages), PAGES2KB(target_pages), +#ifdef CONFIG_HIGHMEM PAGES2KB(balloon_low), PAGES2KB(balloon_high)); +#else + PAGES2KB(balloon_low)); + WARN_ON(balloon_high); +#endif if (hard_limit != ~0UL) { len += sprintf( @@ -528,9 +537,6 @@ static int __init balloon_init(void) current_pages = min(xen_start_info->nr_pages, max_pfn); totalram_pages = current_pages; target_pages = current_pages; - balloon_low = 0; - balloon_high = 0; - driver_pages = 0UL; hard_limit = ~0UL; init_timer(&balloon_timer);