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

Commit a7f8c50d authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86, mm: fix misuse of debug_kmap_atomic 



Impact: fix CONFIG_DEBUG_HIGHMEM=y breakage

Commit 7ca43e75 ("mm: use debug_kmap_atomic") introduced some
debug_kmap_atomic() calls in the wrong places.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20090402070126.GA3951@localhost.localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 83f2f0ed

arch/x86/mm/highmem_32.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) 


	debug_kmap_atomic(type);



	debug_kmap_atomic(type);

	idx = type + KM_TYPE_NR*smp_processor_id();

	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);

	BUG_ON(!pte_none(*(kmap_pte-idx)));

arch/x86/mm/iomap_32.c

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot) 


	pagefault_disable();



	debug_kmap_atomic(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));
@@ -72,7 +73,6 @@ iounmap_atomic(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();



	debug_kmap_atomic(type);

	/*

	 * Force other mappings to Oops if they'll try to access this pte

	 * without first remap it.  Keeping stale mappings around is a bad idea