Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b36ac9e8 authored by Ingo Molnar's avatar Ingo Molnar Committed by Benjamin Herrenschmidt
Browse files

powerpc/cell: Fix some u64 vs. long types 



in/out_be64() work on u64s.

The first parameter to ppc_md.ioremap is a phys_addr_t.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 19b0bd02

arch/powerpc/platforms/cell/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

arch/powerpc/platforms/cell/io-workarounds.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/cell/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -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;