Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-13 22:27:16 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-10-13 22:27:16 +0200
commit1d2211269833faf8968ca8003f68f71c1616d777 (patch)
treea6a3d483662136e2da8180b4dbea9b0677e9c4b7
parent795ee62f0dd24d6a4c163dbd6caffaf648193447 (diff)
parentbfb35e3c6436ac06659029ca67a5940ca08efa20 (diff)
Merge branch 'rt/head' into rt/2.6.31
-rw-r--r--arch/x86/include/asm/highmem.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
index ea04ada56e7a..433ae1f02e95 100644
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
@@ -69,6 +69,8 @@ void __kunmap_atomic(void *kvaddr, enum km_type type);
void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type);
struct page *__kmap_atomic_to_page(void *ptr);
+void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
+
#ifndef CONFIG_PARAVIRT
#define kmap_atomic_pte(page, type) kmap_atomic(page, type)
#define kmap_atomic_pte_direct(page, type) kmap_atomic_direct(page, type)