diff options
| author | Tim Deegan <Tim.Deegan@xensource.com> | 2007-04-05 15:11:49 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@xensource.com> | 2007-04-05 15:11:49 +0100 |
| commit | b6293b0c3a937578bf22a8cd1d7506327f99b579 (patch) | |
| tree | 8f136ebd4697e9d0084385b46777b725d7a95582 /unmodified_drivers | |
| parent | 538a65bcc3279e4539599de04d3317a5373c3b9f (diff) | |
| parent | aeb2e1298b7f7e3bddc3f34a53928e3a445019a1 (diff) | |
| download | xen-b6293b0c3a937578bf22a8cd1d7506327f99b579.tar.gz xen-b6293b0c3a937578bf22a8cd1d7506327f99b579.tar.bz2 xen-b6293b0c3a937578bf22a8cd1d7506327f99b579.zip | |
Merge
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/overrides.mk | 3 | ||||
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/unmodified_drivers/linux-2.6/overrides.mk b/unmodified_drivers/linux-2.6/overrides.mk index b00c63d4f0..db791e75ef 100644 --- a/unmodified_drivers/linux-2.6/overrides.mk +++ b/unmodified_drivers/linux-2.6/overrides.mk @@ -4,7 +4,8 @@ # # (i.e. we need the native config for things like -mregparm, but # a Xen kernel to find the right headers) -EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030202 +EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030205 +EXTRA_CFLAGS += -DCONFIG_XEN_COMPAT=0xffffff EXTRA_CFLAGS += -I$(M)/include -I$(M)/compat-include -DHAVE_XEN_PLATFORM_COMPAT_H ifeq ($(ARCH),ia64) EXTRA_CFLAGS += -DCONFIG_VMX_GUEST 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", |