[PATCH] balloon: don't talk about low/high memory when there is no such distinction

["Jan Beulich" <jbeulich@novell.com>]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

.. in order to not confuse people.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

[-- Attachment #2: xenlinux-balloon-no-highmem.patch --]
[-- Type: text/plain, Size: 1156 bytes --]

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);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel