aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-30 10:33:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:16:12 +0200
commit3ae960a598b9dfe87b29eb70738d91a13e692498 (patch)
treece088a7df3018570a70ea4a93b7a95f55712f346
parent1a98fd14f44cfade4af3e6ed96ba55065fa17ee4 (diff)
- x86: move early_ioremap prototypes to io.h
now that the early-ioremap code is unified, move the prototypes too from io_32.h to io.h. this fixes: arch/x86/kernel/setup.c:531: error: implicit declaration of function ‘early_ioremap_init' on 64-bit. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/io.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index c63563df4ac..bf5d629b3a3 100644
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
@@ -5,6 +5,20 @@
#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) \