Commit efc9eb20 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: remove duplicate early_ioremap declarations 



early_ioremap() is redeclared in several places; remove them.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent be43d728

include/asm-x86/io.h

+0 −14
Original line number Diff line number Diff line
@@ -5,20 +5,6 @@ 


#include <linux/compiler.h>



/*

 * early_ioremap() and early_iounmap() are for temporary early boot-time

 * mappings, before the real ioremap() is functional.

 * A boot-time mapping is currently limited to at most 16 pages.

 */

#ifndef __ASSEMBLY__

extern void early_ioremap_init(void);

extern void early_ioremap_clear(void);

extern void early_ioremap_reset(void);

extern void *early_ioremap(unsigned long offset, unsigned long size);

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

extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);

#endif



#define build_mmio_read(name, size, type, reg, barrier) \

static inline type name(const volatile void __iomem *addr) \

{ type ret; asm volatile("mov" size " %1,%0":reg (ret) \

include/asm-x86/io_64.h

+0 −3
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ static inline void *phys_to_virt(unsigned long address) 


#include <asm-generic/iomap.h>



extern void *early_ioremap(unsigned long addr, unsigned long size);

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



/*

 * This one maps high address device memory and turns off caching for that area.

 * it's useful if some control registers are in such an area and write combining