aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/mpparse.c
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-07-26 20:03:34 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-07-26 20:03:34 +0000
commite79f9f9bf033cdf66422089c6bb3ffb309ec8650 (patch)
treed8899281dc9fd3beb0b0b73ddc5c9323e63f2b32 /xen/arch/x86/mpparse.c
parenta61052ced78d6b7a6dec9447bbd91c376ff93dd5 (diff)
downloadxen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.tar.gz
xen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.tar.bz2
xen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.zip
bitkeeper revision 1.1108.1.29 (41056396oI8TDCaTvBdU_3II1cHF9Q)
Rename memory allocator interfaces in Xen to avoid conflicts with Linux namespace.
Diffstat (limited to 'xen/arch/x86/mpparse.c')
-rw-r--r--xen/arch/x86/mpparse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index d10e4ce9dd..c371424e8e 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -509,7 +509,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
count = (max_mp_busses * sizeof(int)) * 4;
count += (max_irq_sources * sizeof(struct mpc_config_intsrc));
- bus_data = (void *)__get_free_pages(get_order(count));
+ bus_data = (void *)alloc_xenheap_pages(get_order(count));
if (!bus_data) {
printk(KERN_ERR "SMP mptable: out of memory!\n");
return 0;
@@ -694,7 +694,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
} *bus_data;
- bus_data = (void *)__get_free_pages(get_order(sizeof(*bus_data)));
+ bus_data = (void *)alloc_xenheap_pages(get_order(sizeof(*bus_data)));
if (!bus_data)
panic("SMP mptable: out of memory!\n");
mp_bus_id_to_type = bus_data->mp_bus_id_to_type;
@@ -1171,7 +1171,7 @@ void __init mp_config_acpi_legacy_irqs (void)
count = (MAX_MP_BUSSES * sizeof(int)) * 4;
count += (MAX_IRQ_SOURCES * sizeof(int)) * 4;
- bus_data = (void *)__get_free_pages(get_order(count));
+ bus_data = (void *)alloc_xenheap_pages(get_order(count));
if (!bus_data) {
panic("Fatal: can't allocate bus memory for ACPI legacy IRQ!");
}