aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-17 13:33:55 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-17 13:33:55 +0000
commit34f71bcc7ce9196ff101ceed2e339af921db984c (patch)
tree4ce3366d06213ded266bb00c382c3ea08206d0ed
parent4a58a25381626269f089ae80501266fccdbaf960 (diff)
downloadxen-34f71bcc7ce9196ff101ceed2e339af921db984c.tar.gz
xen-34f71bcc7ce9196ff101ceed2e339af921db984c.tar.bz2
xen-34f71bcc7ce9196ff101ceed2e339af921db984c.zip
Allocate_empty_lowmem_regions available to non-priv domains
and to modules. From Ross Mcilroy.
-rw-r--r--linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c4
-rw-r--r--linux-2.6-xen-sparse/include/asm-xen/hypervisor.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c
index bd75d0622d..2c9f9acc3f 100644
--- a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c
@@ -35,6 +35,7 @@
#include <asm/pgtable.h>
#include <asm-xen/hypervisor.h>
#include <asm-xen/balloon.h>
+#include <linux/module.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <linux/percpu.h>
#include <asm/tlbflush.h>
@@ -352,7 +353,6 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
balloon_unlock(flags);
}
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
unsigned long allocate_empty_lowmem_region(unsigned long pages)
{
@@ -401,4 +401,4 @@ unsigned long allocate_empty_lowmem_region(unsigned long pages)
return vstart;
}
-#endif /* CONFIG_XEN_PHYSDEV_ACCESS */
+EXPORT_SYMBOL(allocate_empty_lowmem_region);
diff --git a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
index af2dacf9ee..2167a737f7 100644
--- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
@@ -137,10 +137,8 @@ void xen_invlpg_mask(cpumask_t *mask, unsigned long ptr);
void xen_create_contiguous_region(unsigned long vstart, unsigned int order);
void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
/* Allocate a contiguous empty region of low memory. Return virtual start. */
unsigned long allocate_empty_lowmem_region(unsigned long pages);
-#endif
#include <asm/hypercall.h>