Skip to content

Commit

Permalink
powerpc/cell: Fix some u64 vs. long types
Browse files Browse the repository at this point in the history
in/out_be64() work on u64s.

The first parameter to ppc_md.ioremap is a phys_addr_t.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Ingo Molnar authored and Benjamin Herrenschmidt committed Jan 8, 2009
1 parent 19b0bd0 commit b36ac9e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static unsigned int iic_get_irq(void)

iic = &__get_cpu_var(iic);
*(unsigned long *) &pending =
in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
in_be64((u64 __iomem *) &iic->regs->pending_destr);
if (!(pending.flags & CBE_IIC_IRQ_VALID))
return NO_IRQ;
virq = irq_linear_revmap(iic_host, iic_pending_to_hwnum(pending));
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/cell/io-workarounds.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ static const struct ppc_pci_io __devinitconst iowa_pci_io = {

};

static void __iomem *iowa_ioremap(unsigned long addr, unsigned long size,
static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
unsigned long flags)
{
struct iowa_bus *bus;
void __iomem *res = __ioremap(addr, size, flags);
int busno;

bus = iowa_pci_find(0, addr);
bus = iowa_pci_find(0, (unsigned long)addr);
if (bus != NULL) {
busno = bus - iowa_busses;
PCI_SET_ADDR_TOKEN(res, busno + 1);
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/cell/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ static int cbe_nr_iommus;
static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte,
long n_ptes)
{
unsigned long __iomem *reg;
unsigned long val;
u64 __iomem *reg;
u64 val;
long n;

reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
Expand Down

0 comments on commit b36ac9e

Please sign in to comment.