mm: use debug_kmap_atomic
Subsystems (6)
PATCH 45/183 mm: use debug_kmap_atomic
From: Akinobu Mita <[email protected]>
Use debug_kmap_atomic in kmap_atomic, kmap_atomic_pfn, and iomap_atomic_prot_pfn.
Signed-off-by Akinobu Mita <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/mips/mm/highmem.c | 2 ++ arch/powerpc/include/asm/highmem.h | 2 ++ arch/sparc/mm/highmem.c | 1 + arch/x86/mm/highmem_32.c | 1 + arch/x86/mm/iomap_32.c | 2 ++ include/asm-frv/highmem.h | 2 ++ include/asm-mn10300/highmem.h | 2 ++ 7 files changed, 12 insertions(+)
arch/mips/mm/highmem.c renamed from arch/mips/mm/highmem.c~use-debug_kmap_atomic +2 -0
@@ -42,6 +42,7 @@ void *__kmap_atomic(struct page *page, eif (!PageHighMem (page))return page_address (page); +debug_kmap_atomic (type); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
@@ -88,6 +89,7 @@ void *kmap_atomic_pfn(unsigned long pfn,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, kmap_prot));
arch/powerpc/include/asm/highmem.h renamed from arch/powerpc/include/asm/highmem.h~use-debug_kmap_atomic +2 -0
@@ -24,6 +24,7 @@#include <linux/init.h> #include <linux/interrupt.h> +#include <linux/highmem.h> #include <asm/kmap_types.h> #include <asm/tlbflush.h> #include <asm/page.h>
@@ -94,6 +95,7 @@ static inline void *kmap_atomic_prot(strif (!PageHighMem (page))return page_address (page); +debug_kmap_atomic (type); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
arch/sparc/mm/highmem.c renamed from arch/sparc/mm/highmem.c~use-debug_kmap_atomic +1 -0
@@ -39,6 +39,7 @@ void *kmap_atomic(struct page *page, enuif (!PageHighMem (page))return page_address (page); +debug_kmap_atomic (type); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);
arch/x86/mm/highmem_32.c renamed from arch/x86/mm/highmem_32.c~use-debug_kmap_atomic +1 -0
@@ -40,6 +40,7 @@ void *kmap_atomic_prot(struct page *pagedebug_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 renamed from arch/x86/mm/iomap_32.c~use-debug_kmap_atomic +2 -0
@@ -19,6 +19,7 @@#include <asm/iomap.h> #include <asm/pat.h> #include <linux/module.h> +#include <linux/highmem.h> int is_io_mapping_possible (resource_size_t base,unsigned long size) {
@@ -71,6 +72,7 @@ iounmap_atomic(void *kvaddr, enum km_typunsigned 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
include/asm-frv/highmem.h renamed from include/asm-frv/highmem.h~use-debug_kmap_atomic +2 -0
@@ -18,6 +18,7 @@#ifdef __KERNEL__#include <linux/init.h> +#include <linux/highmem.h> #include <asm/mem-layout.h> #include <asm/spr-regs.h> #include <asm/mb-regs.h>
@@ -116,6 +117,7 @@ static inline void *kmap_atomic(struct punsigned long paddr;pagefault_disable (); +debug_kmap_atomic (type); paddr =page_to_phys (page);switch (type) {
include/asm-mn10300/highmem.h renamed from include/asm-mn10300/highmem.h~use-debug_kmap_atomic +2 -0
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/interrupt.h> +#include <linux/highmem.h> #include <asm/kmap_types.h> #include <asm/pgtable.h>
@@ -77,6 +78,7 @@ static inline unsigned long kmap_atomic(if (page < highmem_start_page)return page_address (page); +debug_kmap_atomic (type); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#if HIGHMEM_DEBUG
_