merge with xen-unstable.hg

2 files changed, 0 insertions, 19 deletions

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index c9f6d73109..8e69557ac8 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -208,14 +208,6 @@ static uint64_t get_callback_via(struct pci_dev *pdev)
 		((uint64_t)(pin - 1) & 3));
 }
 
-/* Invalidate foreign mappings (e.g., in qemu-based device model). */
-static uint16_t invlmap_port;
-void xen_invalidate_foreign_mappings(void)
-{
-	outb(0, invlmap_port);
-}
-EXPORT_SYMBOL(xen_invalidate_foreign_mappings);
-
 static int __devinit platform_pci_init(struct pci_dev *pdev,
 				       const struct pci_device_id *ent)
 {
@@ -240,8 +232,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
 		return -ENOENT;
 	}
 
-	invlmap_port = ioaddr;
-
 	if (request_mem_region(mmio_addr, mmio_len, DRV_NAME) == NULL)
 	{
 		printk(KERN_ERR ":MEM I/O resource 0x%lx @ 0x%lx busy\n",
diff --git a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
index 431115a8cc..bb0bdc0722 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
@@ -59,12 +59,3 @@ void xen_machphys_update(unsigned long mfn, unsigned long pfn)
 }
 EXPORT_SYMBOL(xen_machphys_update);
 
-void balloon_update_driver_allowance(long delta)
-{
-}
-EXPORT_SYMBOL(balloon_update_driver_allowance);
-
-void balloon_release_driver_page(struct page *page)
-{
-}
-EXPORT_SYMBOL(balloon_release_driver_page);