diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2009-03-31 18:23:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:14 -0400 |
commit | 7ca43e7564679604d86e9ed834e7bbcffd8a4a3f (patch) | |
tree | 575e21270d7c8284f54b1e91eb5dd128ae03d713 /include | |
parent | f4112de6b679d84bd9b9681c7504be7bdfb7c7d5 (diff) |
mm: use debug_kmap_atomic
Use debug_kmap_atomic in kmap_atomic, kmap_atomic_pfn, and
iomap_atomic_prot_pfn.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-frv/highmem.h | 2 | ||||
-rw-r--r-- | include/asm-mn10300/highmem.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h index 26cefcde5cee..68e4677fb9e7 100644 --- a/include/asm-frv/highmem.h +++ b/include/asm-frv/highmem.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | 19 | ||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/highmem.h> | ||
21 | #include <asm/mem-layout.h> | 22 | #include <asm/mem-layout.h> |
22 | #include <asm/spr-regs.h> | 23 | #include <asm/spr-regs.h> |
23 | #include <asm/mb-regs.h> | 24 | #include <asm/mb-regs.h> |
@@ -116,6 +117,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type) | |||
116 | unsigned long paddr; | 117 | unsigned long paddr; |
117 | 118 | ||
118 | pagefault_disable(); | 119 | pagefault_disable(); |
120 | debug_kmap_atomic(type); | ||
119 | paddr = page_to_phys(page); | 121 | paddr = page_to_phys(page); |
120 | 122 | ||
121 | switch (type) { | 123 | switch (type) { |
diff --git a/include/asm-mn10300/highmem.h b/include/asm-mn10300/highmem.h index 5256854c0453..90f2abb04bfd 100644 --- a/include/asm-mn10300/highmem.h +++ b/include/asm-mn10300/highmem.h | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/highmem.h> | ||
19 | #include <asm/kmap_types.h> | 20 | #include <asm/kmap_types.h> |
20 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
21 | 22 | ||
@@ -77,6 +78,7 @@ static inline unsigned long kmap_atomic(struct page *page, enum km_type type) | |||
77 | if (page < highmem_start_page) | 78 | if (page < highmem_start_page) |
78 | return page_address(page); | 79 | return page_address(page); |
79 | 80 | ||
81 | debug_kmap_atomic(type); | ||
80 | idx = type + KM_TYPE_NR * smp_processor_id(); | 82 | idx = type + KM_TYPE_NR * smp_processor_id(); |
81 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); | 83 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
82 | #if HIGHMEM_DEBUG | 84 | #if HIGHMEM_DEBUG |