diff options
-rw-r--r-- | arch/powerpc/platforms/cell/interrupt.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/io-workarounds.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c index 2d5bb22d6c09..28c04dab2633 100644 --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c | |||
@@ -148,7 +148,7 @@ static unsigned int iic_get_irq(void) | |||
148 | 148 | ||
149 | iic = &__get_cpu_var(iic); | 149 | iic = &__get_cpu_var(iic); |
150 | *(unsigned long *) &pending = | 150 | *(unsigned long *) &pending = |
151 | in_be64((unsigned long __iomem *) &iic->regs->pending_destr); | 151 | in_be64((u64 __iomem *) &iic->regs->pending_destr); |
152 | if (!(pending.flags & CBE_IIC_IRQ_VALID)) | 152 | if (!(pending.flags & CBE_IIC_IRQ_VALID)) |
153 | return NO_IRQ; | 153 | return NO_IRQ; |
154 | virq = irq_linear_revmap(iic_host, iic_pending_to_hwnum(pending)); | 154 | virq = irq_linear_revmap(iic_host, iic_pending_to_hwnum(pending)); |
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c index b5f84e8f0899..059cad6c3f69 100644 --- a/arch/powerpc/platforms/cell/io-workarounds.c +++ b/arch/powerpc/platforms/cell/io-workarounds.c | |||
@@ -130,14 +130,14 @@ static const struct ppc_pci_io __devinitconst iowa_pci_io = { | |||
130 | 130 | ||
131 | }; | 131 | }; |
132 | 132 | ||
133 | static void __iomem *iowa_ioremap(unsigned long addr, unsigned long size, | 133 | static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size, |
134 | unsigned long flags) | 134 | unsigned long flags) |
135 | { | 135 | { |
136 | struct iowa_bus *bus; | 136 | struct iowa_bus *bus; |
137 | void __iomem *res = __ioremap(addr, size, flags); | 137 | void __iomem *res = __ioremap(addr, size, flags); |
138 | int busno; | 138 | int busno; |
139 | 139 | ||
140 | bus = iowa_pci_find(0, addr); | 140 | bus = iowa_pci_find(0, (unsigned long)addr); |
141 | if (bus != NULL) { | 141 | if (bus != NULL) { |
142 | busno = bus - iowa_busses; | 142 | busno = bus - iowa_busses; |
143 | PCI_SET_ADDR_TOKEN(res, busno + 1); | 143 | PCI_SET_ADDR_TOKEN(res, busno + 1); |
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 86db4dd170a0..88d94b59a7cb 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -150,8 +150,8 @@ static int cbe_nr_iommus; | |||
150 | static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte, | 150 | static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte, |
151 | long n_ptes) | 151 | long n_ptes) |
152 | { | 152 | { |
153 | unsigned long __iomem *reg; | 153 | u64 __iomem *reg; |
154 | unsigned long val; | 154 | u64 val; |
155 | long n; | 155 | long n; |
156 | 156 | ||
157 | reg = iommu->xlate_regs + IOC_IOPT_CacheInvd; | 157 | reg = iommu->xlate_regs + IOC_IOPT_CacheInvd; |