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

Commit cd7bcf32 authored by Tony Luck's avatar Tony Luck Committed by David Woodhouse
Browse files

implement early_io{re,un}map for ia64 



Needed for commit 2c992208 ("intel-iommu: Detect DMAR in hyperspace at 
probe time.) to build on IA64.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 354bb65e

arch/ia64/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -424,6 +424,8 @@ __writeq (unsigned long val, volatile void __iomem *addr) 
extern void __iomem * ioremap(unsigned long offset, unsigned long size);

extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);

extern void iounmap (volatile void __iomem *addr);

extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);

extern void early_iounmap (volatile void __iomem *addr, unsigned long size);



/*

 * String version of IO memory access ops:

arch/ia64/mm/ioremap.c

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ __ioremap (unsigned long phys_addr) 
	return (void __iomem *) (__IA64_UNCACHED_OFFSET | phys_addr);

}



void __iomem *

early_ioremap (unsigned long phys_addr, unsigned long size)

{

	return __ioremap(phys_addr);

}



void __iomem *

ioremap (unsigned long phys_addr, unsigned long size)

{
@@ -101,6 +107,11 @@ ioremap_nocache (unsigned long phys_addr, unsigned long size) 
}

EXPORT_SYMBOL(ioremap_nocache);



void

early_iounmap (volatile void __iomem *addr, unsigned long size)

{

}



void

iounmap (volatile void __iomem *addr)

{