diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-09-30 23:29:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:31 -0700 |
| commit | 801f92ad5a0c630646f6746f3ed1663fcab185d1 (patch) | |
| tree | 4e8250fc77717c50e2d58a224545299489b98eb9 /arch/alpha/kernel | |
| parent | db71daabad0821996483dfe309c4bc81d6755a70 (diff) | |
| download | kernel_samsung_aries-801f92ad5a0c630646f6746f3ed1663fcab185d1.zip kernel_samsung_aries-801f92ad5a0c630646f6746f3ed1663fcab185d1.tar.gz kernel_samsung_aries-801f92ad5a0c630646f6746f3ed1663fcab185d1.tar.bz2 | |
[PATCH] Generic ioremap_page_range: alpha conversion
Convert Alpha to use generic ioremap_page_range() by turning
__alpha_remap_area_pages() into an inline wrapper around ioremap_page_range().
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/proto.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h index 2a6e3da..21f7128 100644 --- a/arch/alpha/kernel/proto.h +++ b/arch/alpha/kernel/proto.h @@ -1,5 +1,7 @@ #include <linux/interrupt.h> +#include <linux/io.h> +#include <asm/pgtable.h> /* Prototypes of functions used across modules here in this directory. */ @@ -181,9 +183,16 @@ extern void titan_dispatch_irqs(u64, struct pt_regs *); extern void switch_to_system_map(void); extern void srm_paging_stop(void); -/* ../mm/remap.c */ -extern int __alpha_remap_area_pages(unsigned long, unsigned long, - unsigned long, unsigned long); +static inline int +__alpha_remap_area_pages(unsigned long address, unsigned long phys_addr, + unsigned long size, unsigned long flags) +{ + pgprot_t prot; + + prot = __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE + | _PAGE_KWE | flags); + return ioremap_page_range(address, address + size, phys_addr, prot); +} /* irq.c */ |