From 75d01a87e02b6876d63be1996cd427e519751dc4 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 3 Oct 2012 12:28:26 +0100
Subject: [PATCH] --- yaml --- r: 343431 b: refs/heads/master c:
 c61ba7291b81ed7fd8c1dba1b45d05cae3f150f7 h: refs/heads/master i:   343429:
 e1f027bb479440ec1430cfce8f5b3003a6f74037   343427:
 ff599d877f7dcff5edd5d7fad5c4add0d3c62a32   343423:
 2d9d1eefec5e3001c6f8782facf842f5ef9ed47e v: v3

---
 [refs]                         |  2 +-
 trunk/arch/arm/xen/enlighten.c | 23 +++++------------------
 trunk/drivers/xen/Makefile     |  4 ++--
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 84d855037064..abc91b956ef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2374bf57e7861039bb129ead538515502ef7860
+refs/heads/master: c61ba7291b81ed7fd8c1dba1b45d05cae3f150f7
diff --git a/trunk/arch/arm/xen/enlighten.c b/trunk/arch/arm/xen/enlighten.c
index 59bcb96ac369..ba5cc134a7d3 100644
--- a/trunk/arch/arm/xen/enlighten.c
+++ b/trunk/arch/arm/xen/enlighten.c
@@ -8,6 +8,7 @@
 #include <xen/features.h>
 #include <xen/platform_pci.h>
 #include <xen/xenbus.h>
+#include <xen/page.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
 #include <linux/interrupt.h>
@@ -29,6 +30,10 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info;
 
 DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu);
 
+/* These are unused until we support booting "pre-ballooned" */
+unsigned long xen_released_pages;
+struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;
+
 /* TODO: to be removed */
 __read_mostly int xen_have_vector_callback;
 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
@@ -148,21 +153,3 @@ static int __init xen_init_events(void)
 	return 0;
 }
 postcore_initcall(xen_init_events);
-
-/* XXX: only until balloon is properly working */
-int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
-{
-	*pages = alloc_pages(highmem ? GFP_HIGHUSER : GFP_KERNEL,
-			get_order(nr_pages));
-	if (*pages == NULL)
-		return -ENOMEM;
-	return 0;
-}
-EXPORT_SYMBOL_GPL(alloc_xenballooned_pages);
-
-void free_xenballooned_pages(int nr_pages, struct page **pages)
-{
-	kfree(*pages);
-	*pages = NULL;
-}
-EXPORT_SYMBOL_GPL(free_xenballooned_pages);
diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
index 0e8637035457..909bb56e3ade 100644
--- a/trunk/drivers/xen/Makefile
+++ b/trunk/drivers/xen/Makefile
@@ -1,8 +1,8 @@
 ifneq ($(CONFIG_ARM),y)
-obj-y	+= manage.o balloon.o
+obj-y	+= manage.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 endif
-obj-y	+= grant-table.o features.o events.o
+obj-y	+= grant-table.o features.o events.o balloon.o
 obj-y	+= xenbus/
 
 nostackp := $(call cc-option, -fno-stack-protector)