summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/highmem.h
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2009-03-11 15:33:18 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-11 15:47:46 +0100
commitbb6d59ca927d855ffac567b35c0a790c67016103 (patch)
treecbfa2c1b8fd85c1ed93d077625a2e15b5b8a8ea9 /arch/x86/include/asm/highmem.h
parentMerge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/core (diff)
downloadlinux-bb6d59ca927d855ffac567b35c0a790c67016103.tar.xz
linux-bb6d59ca927d855ffac567b35c0a790c67016103.zip
x86: unify kmap_atomic_pfn() and iomap_atomic_prot_pfn()
kmap_atomic_pfn() and iomap_atomic_prot_pfn() are almost same except pgprot. This patch removes the code duplication for these two functions. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> LKML-Reference: <20090311143317.GA22244@localhost.localdomain> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/highmem.h')
-rw-r--r--arch/x86/include/asm/highmem.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
index bf9276bea660..014c2b85ae45 100644
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
@@ -63,6 +63,7 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot);
void *kmap_atomic(struct page *page, enum km_type type);
void kunmap_atomic(void *kvaddr, enum km_type type);
void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
+void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
struct page *kmap_atomic_to_page(void *ptr);
#ifndef CONFIG_PARAVIRT