diff options
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-pci.c | 1 | ||||
| -rw-r--r-- | include/asm-mips64/io.h | 8 | ||||
| -rw-r--r-- | include/asm-mips64/irq.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-pci.c b/arch/mips64/sgi-ip27/ip27-pci.c index bd068d289..cbdd6a5c4 100644 --- a/arch/mips64/sgi-ip27/ip27-pci.c +++ b/arch/mips64/sgi-ip27/ip27-pci.c @@ -265,6 +265,7 @@ pci_fixup_isp1020(struct pci_dev *d) { unsigned short command; + d->resource[0].start |= ((unsigned long)(bus_to_nid[d->bus->number])<<32); printk("PCI: Fixing isp1020 in [bus:slot.fn] %s\n", d->slot_name); /* Configure device to allow bus mastering, i/o and memory mapping. diff --git a/include/asm-mips64/io.h b/include/asm-mips64/io.h index a1ca4492b..dcedea9df 100644 --- a/include/asm-mips64/io.h +++ b/include/asm-mips64/io.h @@ -162,7 +162,7 @@ out: */ #define __OUT1(s) \ -extern inline void __out##s(unsigned int value, unsigned int port) { +extern inline void __out##s(unsigned int value, unsigned long port) { #define __OUT2(m) \ __asm__ __volatile__ ("s" #m "\t%0,%1(%2)" @@ -176,7 +176,7 @@ __OUT1(s##c_p) __OUT2(m) : : "r" (value), "ir" (port), "r" (mips_io_port_base)); SLOW_DOWN_IO; } #define __IN1(t,s) \ -extern __inline__ t __in##s(unsigned int port) { t _v; +extern __inline__ t __in##s(unsigned long port) { t _v; /* * Required nops will be inserted by the assembler @@ -191,7 +191,7 @@ __IN1(t,s##_p) __IN2(m) : "=r" (_v) : "i" (0), "r" (mips_io_port_base+port)); SL __IN1(t,s##c_p) __IN2(m) : "=r" (_v) : "ir" (port), "r" (mips_io_port_base)); SLOW_DOWN_IO; return _v; } #define __INS1(s) \ -extern inline void __ins##s(unsigned int port, void * addr, unsigned long count) { +extern inline void __ins##s(unsigned long port, void * addr, unsigned long count) { #define __INS2(m) \ if (count) \ @@ -217,7 +217,7 @@ __INS1(s##c) __INS2(m) \ : "$1");} #define __OUTS1(s) \ -extern inline void __outs##s(unsigned int port, const void * addr, unsigned long count) { +extern inline void __outs##s(unsigned long port, const void * addr, unsigned long count) { #define __OUTS2(m) \ if (count) \ diff --git a/include/asm-mips64/irq.h b/include/asm-mips64/irq.h index 5baa58f6e..031955635 100644 --- a/include/asm-mips64/irq.h +++ b/include/asm-mips64/irq.h @@ -11,7 +11,7 @@ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H -#define NR_IRQS 64 +#define NR_IRQS 256 #define TIMER_IRQ 0 |