aboutsummaryrefslogtreecommitdiffstats
path: root/linux-2.6-xen-sparse
diff options
context:
space:
mode:
authorSteven Hand <steven@xensource.com>2007-04-05 08:24:56 +0100
committerSteven Hand <steven@xensource.com>2007-04-05 08:24:56 +0100
commit1b46e1faf30d916b2e01ab1678e49309d6fb9eb2 (patch)
treea82b3ce53108bd9405ba4dec09bae135ac5c9222 /linux-2.6-xen-sparse
parentaf6b4b22c25edd5262adc2a8670a228908dd2146 (diff)
downloadxen-1b46e1faf30d916b2e01ab1678e49309d6fb9eb2.tar.gz
xen-1b46e1faf30d916b2e01ab1678e49309d6fb9eb2.tar.bz2
xen-1b46e1faf30d916b2e01ab1678e49309d6fb9eb2.zip
Fix hvm balloon driver; missed this hunk in last checkin.
Signed-off-by: Steven Hand <steven@xensource.com>
Diffstat (limited to 'linux-2.6-xen-sparse')
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
index 195f06921a..4978ea58dc 100644
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
@@ -276,9 +276,11 @@ static int decrease_reservation(unsigned long nr_pages)
if (!PageHighMem(page)) {
v = phys_to_virt(pfn << PAGE_SHIFT);
scrub_pages(v, 1);
+#ifdef CONFIG_XEN
ret = HYPERVISOR_update_va_mapping(
(unsigned long)v, __pte_ma(0), 0);
BUG_ON(ret);
+#endif
}
#ifdef CONFIG_XEN_SCRUB_PAGES
else {