[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1176197502 -3600
# Node ID 17b360da7887502d905e89d76cfca88bbf4840cf
# Parent  e51e99c5b10edfafc4b2975a0ada3744147d2985
# Parent  4d4a7ba24c01edd3fc94d6991ba547110b380a61
Merge
---
 unmodified_drivers/linux-2.6/platform-pci/xen_support.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

diff -r e51e99c5b10e -r 17b360da7887 
unmodified_drivers/linux-2.6/platform-pci/xen_support.c
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Tue Apr 10 
10:30:48 2007 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Tue Apr 10 
10:31:42 2007 +0100
@@ -51,6 +51,19 @@ int HYPERVISOR_grant_table_op(unsigned i
        return xencomm_mini_hypercall_grant_table_op(cmd, uop, count);
 }
 EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
+
+/* without using balloon driver on PV-on-HVM for ia64 */
+void balloon_update_driver_allowance(long delta)
+{
+       /* nothing */
+}
+EXPORT_SYMBOL_GPL(balloon_update_driver_allowance);
+
+void balloon_release_driver_page(struct page *page)
+{
+       /* nothing */
+}
+EXPORT_SYMBOL_GPL(balloon_release_driver_page);
 #endif /* __ia64__ */
 
 void xen_machphys_update(unsigned long mfn, unsigned long pfn)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog