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

Commit 80926770 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Tony Luck
Browse files

ia64: split off early_ioremap() declarations into asm/early_ioremap.h 



Unlike x86, arm64 and ARM, ia64 does not declare its implementations
of early_ioremap/early_iounmap/early_memremap/early_memunmap in a header
file called <asm/early_ioremap.h>

This complicates the use of these functions in generic code, since the
header cannot be included directly, and we have to rely on transitive
includes, which is fragile.

So create a <asm/early_ioremap.h> for ia64, and move the existing
definitions into it.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 67990608

arch/ia64/include/asm/early_ioremap.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_EARLY_IOREMAP_H

#define _ASM_IA64_EARLY_IOREMAP_H



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

#define early_memremap(phys_addr, size)        early_ioremap(phys_addr, size)



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

#define early_memunmap(addr, size)             early_iounmap(addr, size)



#endif

arch/ia64/include/asm/io.h

+1 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */



#include <asm/unaligned.h>

#include <asm/early_ioremap.h>



/* We don't use IO slowdowns on the ia64, but.. */

#define __SLOW_DOWN_IO	do { } while (0)
@@ -427,10 +428,6 @@ __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);

#define early_memremap(phys_addr, size)        early_ioremap(phys_addr, size)

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

#define early_memunmap(addr, size)             early_iounmap(addr, size)

static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)

{

	return ioremap(phys_addr, size);