Skip to content

Commit

Permalink
x86: remove duplicate early_ioremap declarations
Browse files Browse the repository at this point in the history
early_ioremap() is redeclared in several places; remove them.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jeremy Fitzhardinge authored and Ingo Molnar committed Oct 13, 2008
1 parent be43d72 commit efc9eb2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
14 changes: 0 additions & 14 deletions include/asm-x86/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
3 changes: 0 additions & 3 deletions include/asm-x86/io_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit efc9eb2

Please sign in to comment.