Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b77c49ab authored by Chris Metcalf's avatar Chris Metcalf
Browse files

arch/tile: support new kunmap_atomic() naming convention. 



See commit 597781f3.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent bae918ac

arch/tile/include/asm/highmem.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void *kmap_fix_kpte(struct page *page, int finished); 
/* This macro is used only in map_new_virtual() to map "page". */

#define kmap_prot page_to_kpgprot(page)



void kunmap_atomic(void *kvaddr, enum km_type type);

void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type);

void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);

void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);

struct page *kmap_atomic_to_page(void *ptr);

arch/tile/mm/highmem.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void *kmap_atomic(struct page *page, enum km_type type) 
}

EXPORT_SYMBOL(kmap_atomic);



void kunmap_atomic(void *kvaddr, enum km_type type)

void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type)

{

	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;

	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
@@ -300,7 +300,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type) 
	arch_flush_lazy_mmu_mode();

	pagefault_enable();

}

EXPORT_SYMBOL(kunmap_atomic);

EXPORT_SYMBOL(kunmap_atomic_notypecheck);



/*

 * This API is supposed to allow us to map memory without a "struct page".