leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: unify kmap_atomic_pfn() and iomap_atomic_prot_pfn(), fix

Browse Source 
Impact: build fix

Move kmap_atomic_prot_pfn() to iomap_32.c. It is used on all 32-bit
kernels, while highmem_32.c is only built on highmem kernels.

( Note: the debug_kmap_atomic_prot() check is removed for now, that
  problem is handled via another patch. )

Reported-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090311143317.GA22244@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-03-13 03:20:49 +01:00
parent 12074fa107
commit dd63fdcc63
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/mm/highmem_32.c
View File

@ -121,24 +121,8 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
pagefault_enable(); pagefault_enable();
} }
void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot) /*
{ * This is the same as kmap_atomic() but can map memory that doesn't
enum fixed_addresses idx;
unsigned long vaddr;
pagefault_disable();
debug_kmap_atomic_prot(type);
idx = type + KM_TYPE_NR * smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
arch_flush_lazy_mmu_mode();
return (void*) vaddr;
}
/* This is the same as kmap_atomic() but can map memory that doesn't
* have a struct page associated with it. * have a struct page associated with it.
*/ */
void *kmap_atomic_pfn(unsigned long pfn, enum km_type type) void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)

18
arch/x86/mm/iomap_32.c
View File

@ -32,7 +32,23 @@ int is_io_mapping_possible(resource_size_t base, unsigned long size)
} }
EXPORT_SYMBOL_GPL(is_io_mapping_possible); EXPORT_SYMBOL_GPL(is_io_mapping_possible);
/* Map 'pfn' using fixed map 'type' and protections 'prot' void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
{
enum fixed_addresses idx;
unsigned long vaddr;
pagefault_disable();
idx = type + KM_TYPE_NR * smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
}
/*
* Map 'pfn' using fixed map 'type' and protections 'prot'
*/ */
void * void *
iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot) iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)