diff options
author | Keith Packard <keithp@keithp.com> | 2008-10-30 19:37:09 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-31 10:12:38 +0100 |
commit | fd9409343521eac22b6ed51686128a643c7c976b (patch) | |
tree | d70e3f009a29a7bbfe68b956608854db416bc2af /arch/x86/mm/init_32.c | |
parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
download | op-kernel-dev-fd9409343521eac22b6ed51686128a643c7c976b.zip op-kernel-dev-fd9409343521eac22b6ed51686128a643c7c976b.tar.gz |
x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps
Impact: introduce new APIs, separate kmap code from CONFIG_HIGHMEM
This takes the code used for CONFIG_HIGHMEM memory mappings except that
it's designed for dynamic IO resource mapping.
These fixmaps are available even with CONFIG_HIGHMEM turned off.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 8396868..c483f42 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -334,7 +334,6 @@ int devmem_is_allowed(unsigned long pagenr) return 0; } -#ifdef CONFIG_HIGHMEM pte_t *kmap_pte; pgprot_t kmap_prot; @@ -357,6 +356,7 @@ static void __init kmap_init(void) kmap_prot = PAGE_KERNEL; } +#ifdef CONFIG_HIGHMEM static void __init permanent_kmaps_init(pgd_t *pgd_base) { unsigned long vaddr; @@ -436,7 +436,6 @@ static void __init set_highmem_pages_init(void) #endif /* !CONFIG_NUMA */ #else -# define kmap_init() do { } while (0) # define permanent_kmaps_init(pgd_base) do { } while (0) # define set_highmem_pages_init() do { } while (0) #endif /* CONFIG_HIGHMEM */ |