diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:41:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:41:53 -0500 |
| commit | e3d8b77bc7a89d190ee895d0570af10c026e5086 (patch) | |
| tree | 56f333679ac333abe2dcddce64e73fb211216044 /include | |
| parent | 9cfcceea8f7e8f5554e9c8130e568bcfa98a3a64 (diff) | |
| parent | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index ef436b9d06ad..9d41548b7fef 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
| @@ -120,6 +120,7 @@ extern unsigned long max_low_pfn; | |||
| 120 | 120 | ||
| 121 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 121 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
| 122 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 122 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
| 123 | #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) | ||
| 123 | 124 | ||
| 124 | typedef union ia64_va { | 125 | typedef union ia64_va { |
| 125 | struct { | 126 | struct { |