WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] merge

# HG changeset patch
# User Emmanuel Ackaouy <ack@xxxxxxxxxxxxx>
# Date 1168019174 0
# Node ID 1b7ebd25fa40cf603910f1ffc7d59eba03050da1
# Parent  973e4d23346142ecb525ecc6eb6c587ef3df4bee
# Parent  12a441c7b5c5fcab0505b04bd7212b0fda5f2492
merge
---
 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -r 973e4d233461 -r 1b7ebd25fa40 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Fri Jan 05 
17:34:43 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Fri Jan 05 
17:46:14 2007 +0000
@@ -446,8 +446,10 @@ static struct notifier_block xenstore_no
 
 static int __init balloon_init(void)
 {
+#ifdef CONFIG_X86
        unsigned long pfn;
        struct page *page;
+#endif
 
        if (!is_running_on_xen())
                return -ENODEV;
@@ -476,13 +478,15 @@ static int __init balloon_init(void)
        balloon_pde->write_proc = balloon_write;
 #endif
        balloon_sysfs_init();
-    
+
+#ifdef CONFIG_X86
        /* Initialise the balloon with excess memory space. */
        for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
                page = pfn_to_page(pfn);
                if (!PageReserved(page))
                        balloon_append(page);
        }
+#endif
 
        target_watch.callback = watch_target;
        xenstore_notifier.notifier_call = balloon_init_watcher;

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

<Prev in Thread] Current Thread [Next in Thread>