projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/for-jens-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
highmem.h
diff --git
a/arch/x86/include/asm/highmem.h
b/arch/x86/include/asm/highmem.h
index
04e9d02
..
1c0b437
100644
(file)
--- a/
arch/x86/include/asm/highmem.h
+++ b/
arch/x86/include/asm/highmem.h
@@
-68,7
+68,6
@@
void *kmap_atomic(struct page *page);
void __kunmap_atomic(void *kvaddr);
void *kmap_atomic_pfn(unsigned long pfn);
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot);
-struct page *kmap_atomic_to_page(void *ptr);
#define flush_cache_kmaps() do { } while (0)