diff options
| author | Keir Fraser <keir@xensource.com> | 2007-02-08 17:38:30 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xensource.com> | 2007-02-08 17:38:30 +0000 |
| commit | 17c65a4118cecd755d5d82f935b08d2789882fd0 (patch) | |
| tree | 2ed9969a48ed725c8624943149c3a87f4f839015 /unmodified_drivers | |
| parent | 6f7ae0fe6f83653ebd286e8c263b9fa98a736d7d (diff) | |
| download | xen-17c65a4118cecd755d5d82f935b08d2789882fd0.tar.gz xen-17c65a4118cecd755d5d82f935b08d2789882fd0.tar.bz2 xen-17c65a4118cecd755d5d82f935b08d2789882fd0.zip | |
Small cleanups to PV-on-HVM support code.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 21 |
1 files changed, 9 insertions, 12 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 1cbfcf11b9..bb7120b028 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -118,14 +118,10 @@ unsigned long alloc_xen_mmio(unsigned long len) { unsigned long addr; - addr = 0; - if (platform_mmio_alloc + len <= platform_mmiolen) - { - addr = platform_mmio + platform_mmio_alloc; - platform_mmio_alloc += len; - } else { - panic("ran out of xen mmio space"); - } + addr = platform_mmio + platform_mmio_alloc; + platform_mmio_alloc += len; + BUG_ON(platform_mmio_alloc > platform_mmiolen); + return addr; } @@ -182,16 +178,17 @@ static int get_hypercall_stubs(void) static uint64_t get_callback_via(struct pci_dev *pdev) { u8 pin; + int irq; + #ifdef __ia64__ - int irq, rid; for (irq = 0; irq < 16; irq++) { if (isa_irq_to_vector(irq) == pdev->irq) return irq; /* ISA IRQ */ } #else /* !__ia64__ */ - - if (pdev->irq < 16) - return pdev->irq; /* ISA IRQ */ + irq = pdev->irq; + if (irq < 16) + return irq; /* ISA IRQ */ #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) |