Merge tag 'perf-core-for-mingo-20160606' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / ia64 / sn / kernel / io_init.c

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index c15a41e2d1f2e85662fbfeaa811c7bb90d71e745..d63809a6adfadbd87e4b3ad0cbf658de05d3bf45 100644 (file)
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -151,7 +151,7 @@ sn_io_slot_fixup(struct pci_dev *dev)
 {
        int idx;
        struct resource *res;
-       unsigned long addr, size;
+       unsigned long size;
        struct pcidev_info *pcidev_info;
        struct sn_irq_info *sn_irq_info;
        int status;
@@ -186,7 +186,7 @@ sn_io_slot_fixup(struct pci_dev *dev)
                        continue;
 
                res->start = pcidev_info->pdi_pio_mapped_addr[idx];
-               res->end = addr + size;
+               res->end = res->start + size;
 
                /*
                 * if it's already in the device structure, remove it before