diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
| commit | c1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch) | |
| tree | 9333907ca767be24fcb3667877242976c3e3c8dd /include/linux/highmem.h | |
| parent | 559fb51ba7e66fe298b8355fabde1275b7def35f (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/highmem.h')
| -rw-r--r-- | include/linux/highmem.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 2a7e6c65c882..6bece9280eb7 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h | |||
| @@ -28,6 +28,7 @@ static inline void *kmap(struct page *page) | |||
| 28 | 28 | ||
| 29 | #define kmap_atomic(page, idx) page_address(page) | 29 | #define kmap_atomic(page, idx) page_address(page) |
| 30 | #define kunmap_atomic(addr, idx) do { } while (0) | 30 | #define kunmap_atomic(addr, idx) do { } while (0) |
| 31 | #define kmap_atomic_pfn(pfn, idx) page_address(pfn_to_page(pfn)) | ||
| 31 | #define kmap_atomic_to_page(ptr) virt_to_page(ptr) | 32 | #define kmap_atomic_to_page(ptr) virt_to_page(ptr) |
| 32 | 33 | ||
| 33 | #endif /* CONFIG_HIGHMEM */ | 34 | #endif /* CONFIG_HIGHMEM */ |