From: "Jan Beulich" Subject: [PATCH] balloon: don't talk about low/high memory when there is no such distinction Date: Fri, 23 Jun 2006 14:26:38 +0200 Message-ID: <449BFA1E.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part84A156EE.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part84A156EE.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline .. in order to not confuse people. Signed-off-by: Jan Beulich --=__Part84A156EE.0__= Content-Type: text/plain; name="xenlinux-balloon-no-highmem.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xenlinux-balloon-no-highmem.patch" 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); --=__Part84A156EE.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__Part84A156EE.0__=--