diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /arch/powerpc/mm | |
parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index f4e5ac122615..d296eb6b4545 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -37,6 +37,7 @@ | |||
37 | 37 | ||
38 | unsigned long ioremap_base; | 38 | unsigned long ioremap_base; |
39 | unsigned long ioremap_bot; | 39 | unsigned long ioremap_bot; |
40 | EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */ | ||
40 | int io_bat_index; | 41 | int io_bat_index; |
41 | 42 | ||
42 | #if defined(CONFIG_6xx) || defined(CONFIG_POWER3) | 43 | #if defined(CONFIG_6xx) || defined(CONFIG_POWER3) |
@@ -153,6 +154,7 @@ ioremap64(unsigned long long addr, unsigned long size) | |||
153 | { | 154 | { |
154 | return __ioremap(addr, size, _PAGE_NO_CACHE); | 155 | return __ioremap(addr, size, _PAGE_NO_CACHE); |
155 | } | 156 | } |
157 | EXPORT_SYMBOL(ioremap64); | ||
156 | 158 | ||
157 | void __iomem * | 159 | void __iomem * |
158 | ioremap(phys_addr_t addr, unsigned long size) | 160 | ioremap(phys_addr_t addr, unsigned long size) |
@@ -162,6 +164,7 @@ ioremap(phys_addr_t addr, unsigned long size) | |||
162 | return ioremap64(addr64, size); | 164 | return ioremap64(addr64, size); |
163 | } | 165 | } |
164 | #endif /* CONFIG_PHYS_64BIT */ | 166 | #endif /* CONFIG_PHYS_64BIT */ |
167 | EXPORT_SYMBOL(ioremap); | ||
165 | 168 | ||
166 | void __iomem * | 169 | void __iomem * |
167 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) | 170 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) |
@@ -247,6 +250,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) | |||
247 | out: | 250 | out: |
248 | return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK)); | 251 | return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK)); |
249 | } | 252 | } |
253 | EXPORT_SYMBOL(__ioremap); | ||
250 | 254 | ||
251 | void iounmap(volatile void __iomem *addr) | 255 | void iounmap(volatile void __iomem *addr) |
252 | { | 256 | { |
@@ -259,6 +263,7 @@ void iounmap(volatile void __iomem *addr) | |||
259 | if (addr > high_memory && (unsigned long) addr < ioremap_bot) | 263 | if (addr > high_memory && (unsigned long) addr < ioremap_bot) |
260 | vunmap((void *) (PAGE_MASK & (unsigned long)addr)); | 264 | vunmap((void *) (PAGE_MASK & (unsigned long)addr)); |
261 | } | 265 | } |
266 | EXPORT_SYMBOL(iounmap); | ||
262 | 267 | ||
263 | void __iomem *ioport_map(unsigned long port, unsigned int len) | 268 | void __iomem *ioport_map(unsigned long port, unsigned int len) |
264 | { | 269 | { |