aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/io_32.h
diff options
context:
space:
mode:
authorHuang, Ying <ying.huang@intel.com>2008-01-30 07:33:44 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:44 -0500
commitbeacfaac3f23b30814aafee37a055257c7062ef3 (patch)
tree9a9a25cafa5fa4b79026caa8b0b442dc54b78889 /include/asm-x86/io_32.h
parent4716e79c9946044a53a65418cfba04836f6a5c36 (diff)
x86 32-bit boot: rename bt_ioremap() to early_ioremap()
This patch renames bt_ioremap to early_ioremap, which is used in x86_64. This makes it easier to merge i386 and x86_64 usage. [ mingo@elte.hu: fix ] Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/io_32.h')
-rw-r--r--include/asm-x86/io_32.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h
index f7b733d9ace9..059a1fee4de3 100644
--- a/include/asm-x86/io_32.h
+++ b/include/asm-x86/io_32.h
@@ -135,20 +135,20 @@ static inline void __iomem * ioremap(unsigned long offset, unsigned long size)
135extern void iounmap(volatile void __iomem *addr); 135extern void iounmap(volatile void __iomem *addr);
136 136
137/* 137/*
138 * bt_ioremap() and bt_iounmap() are for temporary early boot-time 138 * early_ioremap() and early_iounmap() are for temporary early boot-time
139 * mappings, before the real ioremap() is functional. 139 * mappings, before the real ioremap() is functional.
140 * A boot-time mapping is currently limited to at most 16 pages. 140 * A boot-time mapping is currently limited to at most 16 pages.
141 */ 141 */
142extern void bt_ioremap_init(void); 142extern void early_ioremap_init(void);
143extern void bt_ioremap_clear(void); 143extern void early_ioremap_clear(void);
144extern void bt_ioremap_reset(void); 144extern void early_ioremap_reset(void);
145extern void *bt_ioremap(unsigned long offset, unsigned long size); 145extern void *early_ioremap(unsigned long offset, unsigned long size);
146extern void bt_iounmap(void *addr, unsigned long size); 146extern void early_iounmap(void *addr, unsigned long size);
147extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); 147extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
148 148
149/* Use early IO mappings for DMI because it's initialized early */ 149/* Use early IO mappings for DMI because it's initialized early */
150#define dmi_ioremap bt_ioremap 150#define dmi_ioremap early_ioremap
151#define dmi_iounmap bt_iounmap 151#define dmi_iounmap early_iounmap
152#define dmi_alloc alloc_bootmem 152#define dmi_alloc alloc_bootmem
153 153
154/* 154/*