aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:34:06 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:06 -0500
commit5f8681529cb243b3a492e55f2da9d632ad0d5e32 (patch)
tree8ea316c39d508e828749f5a54c6d0fa66859b6a5 /arch
parent266b9f8727976769e2ed2dad77ac9295f37e321e (diff)
x86: fix ioremap API
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/ioremap.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index e84c09e7d2c1..8777bb7688f4 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -106,8 +106,8 @@ static int ioremap_change_attr(unsigned long phys_addr, unsigned long size,
106 * have to convert them into an offset in a page-aligned mapping, but the 106 * have to convert them into an offset in a page-aligned mapping, but the
107 * caller shouldn't need to know that small detail. 107 * caller shouldn't need to know that small detail.
108 */ 108 */
109void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, 109static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
110 unsigned long flags) 110 unsigned long flags)
111{ 111{
112 void __iomem *addr; 112 void __iomem *addr;
113 struct vm_struct *area; 113 struct vm_struct *area;
@@ -164,7 +164,6 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
164 164
165 return (void __iomem *) (offset + (char __iomem *)addr); 165 return (void __iomem *) (offset + (char __iomem *)addr);
166} 166}
167EXPORT_SYMBOL(__ioremap);
168 167
169/** 168/**
170 * ioremap_nocache - map bus memory into CPU space 169 * ioremap_nocache - map bus memory into CPU space
@@ -193,6 +192,12 @@ void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size)
193} 192}
194EXPORT_SYMBOL(ioremap_nocache); 193EXPORT_SYMBOL(ioremap_nocache);
195 194
195void __iomem *ioremap_cache(unsigned long phys_addr, unsigned long size)
196{
197 return __ioremap(phys_addr, size, 0);
198}
199EXPORT_SYMBOL(ioremap_cache);
200
196/** 201/**
197 * iounmap - Free a IO remapping 202 * iounmap - Free a IO remapping
198 * @addr: virtual address from ioremap_* 203 * @addr: virtual address from ioremap_*