[Xen-changelog] [xen-unstable] [IA64] Rename RID maker HVM_PARAM_CALLBACK_IRQ_RID to IA64_CALLBACK_IRQ_RID

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

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1167781182 25200
# Node ID f69a329a47789b0bba44a692544e0d14fff182d6
# Parent  99ff540b0efefad4c2402b9f93a59c2d597d824c
[IA64] Rename RID maker HVM_PARAM_CALLBACK_IRQ_RID to IA64_CALLBACK_IRQ_RID

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/platform-pci/platform-pci.c |    2 +-
 xen/arch/ia64/vmx/vmx_process.c                          |    2 +-
 xen/include/public/arch-ia64.h                           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 99ff540b0efe -r f69a329a4778 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Tue Jan 02 
16:27:50 2007 -0700
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Tue Jan 02 
16:39:42 2007 -0700
@@ -192,7 +192,7 @@ static int get_callback_irq(struct pci_d
        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 -r 99ff540b0efe -r f69a329a4778 xen/arch/ia64/vmx/vmx_process.c
--- a/xen/arch/ia64/vmx/vmx_process.c   Tue Jan 02 16:27:50 2007 -0700
+++ b/xen/arch/ia64/vmx/vmx_process.c   Tue Jan 02 16:39:42 2007 -0700
@@ -212,7 +212,7 @@ void leave_hypervisor_tail(struct pt_reg
             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 -r 99ff540b0efe -r f69a329a4778 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Tue Jan 02 16:27:50 2007 -0700
+++ b/xen/include/public/arch-ia64.h    Tue Jan 02 16:39:42 2007 -0700
@@ -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 */

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