diff options
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 2 | ||||
| -rw-r--r-- | xen/arch/ia64/vmx/vmx_process.c | 2 | ||||
| -rw-r--r-- | xen/include/public/arch-ia64.h | 2 |
3 files changed, 3 insertions, 3 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 b529ce1308..a1b7eafc4e 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -192,7 +192,7 @@ static int get_callback_irq(struct pci_dev *pdev) rid = ((pdev->bus->number & 0xff) << 8) | pdev->devfn; printk(KERN_INFO DRV_NAME ":use Requester-ID(%04x) as callback irq\n", rid); - return rid | HVM_PARAM_CALLBACK_IRQ_RID; + return rid | IA64_CALLBACK_IRQ_RID; #else /* !__ia64__ */ return pdev->irq; #endif diff --git a/xen/arch/ia64/vmx/vmx_process.c b/xen/arch/ia64/vmx/vmx_process.c index 1fce5524b5..f8ff340a78 100644 --- a/xen/arch/ia64/vmx/vmx_process.c +++ b/xen/arch/ia64/vmx/vmx_process.c @@ -212,7 +212,7 @@ void leave_hypervisor_tail(struct pt_regs *regs) if (callback_irq != 0 && local_events_need_delivery()) { /* change level for para-device callback irq */ /* use level irq to send discrete event */ - if (callback_irq & HVM_PARAM_CALLBACK_IRQ_RID) { + if (callback_irq & IA64_CALLBACK_IRQ_RID) { /* case of using Requester-ID as callback irq */ /* RID: '<#bus(8)><#dev(5)><#func(3)>' */ int dev = (callback_irq >> 3) & 0x1f; diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h index 8b74ba39cc..2da8fba00a 100644 --- a/xen/include/public/arch-ia64.h +++ b/xen/include/public/arch-ia64.h @@ -64,7 +64,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); /* Arch specific callback irq definition */ /* using Requester-ID(RID) as callback irq */ -#define HVM_PARAM_CALLBACK_IRQ_RID (1 << 31) +#define IA64_CALLBACK_IRQ_RID (1 << 31) /* Maximum number of virtual CPUs in multi-processor guests. */ /* WARNING: before changing this, check that shared_info fits on a page */ |