Skip to content

L
linux-davinci
Commit 1d221126 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

Merge branch 'rt/head' into rt/2.6.31

parents 795ee62f bfb35e3c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
arch/x86/include/asm/highmem.h
View file @ 1d221126
...@@ -69,6 +69,8 @@ void __kunmap_atomic(void *kvaddr, enum km_type type); ...@@ -69,6 +69,8 @@ void __kunmap_atomic(void *kvaddr, enum km_type type);
void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type); void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type);
struct page *__kmap_atomic_to_page(void *ptr); 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 #ifndef CONFIG_PARAVIRT
#define kmap_atomic_pte(page, type) kmap_atomic(page, type) #define kmap_atomic_pte(page, type) kmap_atomic(page, type)
#define kmap_atomic_pte_direct(page, type) kmap_atomic_direct(page, type) #define kmap_atomic_pte_direct(page, type) kmap_atomic_direct(page, type)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment