ia64/xen-unstable

changeset 13313:1b7ebd25fa40

merge
author Emmanuel Ackaouy <ack@xensource.com>
date Fri Jan 05 17:46:14 2007 +0000 (2007-01-05)
parents 973e4d233461 12a441c7b5c5
children cb1f71890c93 23dcc167b97e
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Jan 05 17:34:43 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Jan 05 17:46:14 2007 +0000
     1.3 @@ -446,8 +446,10 @@ static struct notifier_block xenstore_no
     1.4  
     1.5  static int __init balloon_init(void)
     1.6  {
     1.7 +#ifdef CONFIG_X86
     1.8  	unsigned long pfn;
     1.9  	struct page *page;
    1.10 +#endif
    1.11  
    1.12  	if (!is_running_on_xen())
    1.13  		return -ENODEV;
    1.14 @@ -476,13 +478,15 @@ static int __init balloon_init(void)
    1.15  	balloon_pde->write_proc = balloon_write;
    1.16  #endif
    1.17  	balloon_sysfs_init();
    1.18 -    
    1.19 +
    1.20 +#ifdef CONFIG_X86
    1.21  	/* Initialise the balloon with excess memory space. */
    1.22  	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
    1.23  		page = pfn_to_page(pfn);
    1.24  		if (!PageReserved(page))
    1.25  			balloon_append(page);
    1.26  	}
    1.27 +#endif
    1.28  
    1.29  	target_watch.callback = watch_target;
    1.30  	xenstore_notifier.notifier_call = balloon_init_watcher;