[Xen-changelog] [linux-2.6.18-xen] balloon: Fix minimum_target() check to work when built as a module.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1210840947 -3600
# Node ID a741afb717006a6751044d1d11cd5412f0bbce3c
# Parent  d59a4aaf8615aea0ff42349f0d0367be641c36b0
balloon: Fix minimum_target() check to work when built as a module.
From: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/balloon/balloon.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r d59a4aaf8615 -r a741afb71700 drivers/xen/balloon/balloon.c
--- a/drivers/xen/balloon/balloon.c     Wed May 14 13:53:06 2008 +0100
+++ b/drivers/xen/balloon/balloon.c     Thu May 15 09:42:27 2008 +0100
@@ -197,8 +197,8 @@ static unsigned long minimum_target(void
 static unsigned long minimum_target(void)
 {
 #ifndef CONFIG_XEN
-       return 0;
-#else
+#define max_pfn num_physpages
+#endif
        unsigned long min_pages, curr_pages = current_target();
 
 #define MB2PAGES(mb) ((mb) << (20 - PAGE_SHIFT))
@@ -226,6 +226,8 @@ static unsigned long minimum_target(void
 
        /* Don't enforce growth */
        return min(min_pages, curr_pages);
+#ifndef CONFIG_XEN
+#undef max_pfn
 #endif
 }
 

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