ia64/xen-unstable

changeset 14782:17b360da7887

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Tue Apr 10 10:31:42 2007 +0100 (2007-04-10)
parents e51e99c5b10e 4d4a7ba24c01
children 099593da38cb
files
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c	Tue Apr 10 10:30:48 2007 +0100
     1.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c	Tue Apr 10 10:31:42 2007 +0100
     1.3 @@ -51,6 +51,19 @@ int HYPERVISOR_grant_table_op(unsigned i
     1.4  	return xencomm_mini_hypercall_grant_table_op(cmd, uop, count);
     1.5  }
     1.6  EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
     1.7 +
     1.8 +/* without using balloon driver on PV-on-HVM for ia64 */
     1.9 +void balloon_update_driver_allowance(long delta)
    1.10 +{
    1.11 +	/* nothing */
    1.12 +}
    1.13 +EXPORT_SYMBOL_GPL(balloon_update_driver_allowance);
    1.14 +
    1.15 +void balloon_release_driver_page(struct page *page)
    1.16 +{
    1.17 +	/* nothing */
    1.18 +}
    1.19 +EXPORT_SYMBOL_GPL(balloon_release_driver_page);
    1.20  #endif /* __ia64__ */
    1.21  
    1.22  void xen_machphys_update(unsigned long mfn, unsigned long pfn)