direct-io.hg

changeset 13449:f69a329a4778

[IA64] Rename RID maker HVM_PARAM_CALLBACK_IRQ_RID to IA64_CALLBACK_IRQ_RID

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
author awilliam@xenbuild2.aw
date Tue Jan 02 16:39:42 2007 -0700 (2007-01-02)
parents 99ff540b0efe
children 912f8af36878
files unmodified_drivers/linux-2.6/platform-pci/platform-pci.c xen/arch/ia64/vmx/vmx_process.c xen/include/public/arch-ia64.h
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Tue Jan 02 16:27:50 2007 -0700
     1.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Tue Jan 02 16:39:42 2007 -0700
     1.3 @@ -192,7 +192,7 @@ static int get_callback_irq(struct pci_d
     1.4  	rid = ((pdev->bus->number & 0xff) << 8) | pdev->devfn;
     1.5  	printk(KERN_INFO DRV_NAME ":use Requester-ID(%04x) as callback irq\n",
     1.6  	       rid);
     1.7 -	return rid | HVM_PARAM_CALLBACK_IRQ_RID;
     1.8 +	return rid | IA64_CALLBACK_IRQ_RID;
     1.9  #else /* !__ia64__ */
    1.10  	return pdev->irq;
    1.11  #endif
     2.1 --- a/xen/arch/ia64/vmx/vmx_process.c	Tue Jan 02 16:27:50 2007 -0700
     2.2 +++ b/xen/arch/ia64/vmx/vmx_process.c	Tue Jan 02 16:39:42 2007 -0700
     2.3 @@ -212,7 +212,7 @@ void leave_hypervisor_tail(struct pt_reg
     2.4              if (callback_irq != 0 && local_events_need_delivery()) {
     2.5                  /* change level for para-device callback irq */
     2.6                  /* use level irq to send discrete event */
     2.7 -                if (callback_irq & HVM_PARAM_CALLBACK_IRQ_RID) {
     2.8 +                if (callback_irq & IA64_CALLBACK_IRQ_RID) {
     2.9                      /* case of using Requester-ID as callback irq */
    2.10                      /* RID: '<#bus(8)><#dev(5)><#func(3)>' */
    2.11                      int dev = (callback_irq >> 3) & 0x1f;
     3.1 --- a/xen/include/public/arch-ia64.h	Tue Jan 02 16:27:50 2007 -0700
     3.2 +++ b/xen/include/public/arch-ia64.h	Tue Jan 02 16:39:42 2007 -0700
     3.3 @@ -64,7 +64,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     3.4  
     3.5  /* Arch specific callback irq definition */
     3.6  /* using Requester-ID(RID) as callback irq */
     3.7 -#define HVM_PARAM_CALLBACK_IRQ_RID        (1 << 31)
     3.8 +#define IA64_CALLBACK_IRQ_RID        (1 << 31)
     3.9  
    3.10  /* Maximum number of virtual CPUs in multi-processor guests. */
    3.11  /* WARNING: before changing this, check that shared_info fits on a page */