diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /include/asm-mips/highmem.h | |
parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) |
Merge branch 'master'
Diffstat (limited to 'include/asm-mips/highmem.h')
-rw-r--r-- | include/asm-mips/highmem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h index f49930d947d4..8cf598402492 100644 --- a/include/asm-mips/highmem.h +++ b/include/asm-mips/highmem.h | |||
@@ -75,6 +75,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | static inline void kunmap_atomic(void *kvaddr, enum km_type type) { } | 77 | static inline void kunmap_atomic(void *kvaddr, enum km_type type) { } |
78 | #define kmap_atomic_pfn(pfn, idx) page_address(pfn_to_page(pfn)) | ||
78 | 79 | ||
79 | #define kmap_atomic_to_page(ptr) virt_to_page(ptr) | 80 | #define kmap_atomic_to_page(ptr) virt_to_page(ptr) |
80 | 81 | ||
@@ -86,6 +87,7 @@ extern void *__kmap(struct page *page); | |||
86 | extern void __kunmap(struct page *page); | 87 | extern void __kunmap(struct page *page); |
87 | extern void *__kmap_atomic(struct page *page, enum km_type type); | 88 | extern void *__kmap_atomic(struct page *page, enum km_type type); |
88 | extern void __kunmap_atomic(void *kvaddr, enum km_type type); | 89 | extern void __kunmap_atomic(void *kvaddr, enum km_type type); |
90 | extern void *kmap_atomic_pfn(unsigned long pfn, enum km_type type); | ||
89 | extern struct page *__kmap_atomic_to_page(void *ptr); | 91 | extern struct page *__kmap_atomic_to_page(void *ptr); |
90 | 92 | ||
91 | #define kmap __kmap | 93 | #define kmap __kmap |