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

Commit 9d17b246 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: mm: fixmap index for highmem starts from FIX_KMAP_BEGIN"

parents 3a136cf4 bbc44181

arch/arm/mm/highmem.c

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void *kmap_atomic(struct page *page) 


	type = kmap_atomic_idx_push();



	idx = type + KM_TYPE_NR * smp_processor_id();

	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();

	vaddr = __fix_to_virt(idx);

#ifdef CONFIG_DEBUG_HIGHMEM

	/*
@@ -106,7 +106,7 @@ void __kunmap_atomic(void *kvaddr) 


	if (kvaddr >= (void *)FIXADDR_START) {

		type = kmap_atomic_idx();

		idx = type + KM_TYPE_NR * smp_processor_id();

		idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();



		if (cache_is_vivt())

			__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
@@ -136,7 +136,7 @@ void *kmap_atomic_pfn(unsigned long pfn) 
		return page_address(page);



	type = kmap_atomic_idx_push();

	idx = type + KM_TYPE_NR * smp_processor_id();

	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();

	vaddr = __fix_to_virt(idx);

#ifdef CONFIG_DEBUG_HIGHMEM

	BUG_ON(!pte_none(*get_fixmap_pte(vaddr)));
@@ -163,7 +163,7 @@ static void kmap_remove_unused_cpu(int cpu) 


	pagefault_disable();

	type = kmap_atomic_idx();

	start_idx = type + 1 + KM_TYPE_NR * cpu;

	start_idx = FIX_KMAP_BEGIN + type + 1 + KM_TYPE_NR * cpu;



	for (idx = start_idx; idx < KM_TYPE_NR + KM_TYPE_NR * cpu; idx++) {

		unsigned long vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);