The patch titled
mm: fix misuse of debug_kmap_atomic
has been added to the -mm tree. Its filename is
mm-fix-misuse-of-debug_kmap_atomic.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm: fix misuse of debug_kmap_atomic
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Commit 7ca43e7564679604d86e9ed834e7bbcffd8a4a3f (mm: use
debug_kmap_atomic) introduced some debug_kmap_atomic() in wrong places.
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/highmem_32.c | 1 -
arch/x86/mm/iomap_32.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff -puN arch/x86/mm/highmem_32.c~mm-fix-misuse-of-debug_kmap_atomic arch/x86/mm/highmem_32.c
--- a/arch/x86/mm/highmem_32.c~mm-fix-misuse-of-debug_kmap_atomic
+++ a/arch/x86/mm/highmem_32.c
@@ -40,7 +40,6 @@ void *kmap_atomic_prot(struct page *page
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)));
diff -puN arch/x86/mm/iomap_32.c~mm-fix-misuse-of-debug_kmap_atomic arch/x86/mm/iomap_32.c
--- a/arch/x86/mm/iomap_32.c~mm-fix-misuse-of-debug_kmap_atomic
+++ a/arch/x86/mm/iomap_32.c
@@ -39,6 +39,7 @@ void *kmap_atomic_prot_pfn(unsigned long
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_typ
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
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
origin.patch
mm-fix-misuse-of-debug_kmap_atomic.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
