diff options
Diffstat (limited to 'include/asm-alpha/page.h')
| -rw-r--r-- | include/asm-alpha/page.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index fa0b41b164a7..61bcf70b5eac 100644 --- a/include/asm-alpha/page.h +++ b/include/asm-alpha/page.h | |||
| @@ -85,8 +85,6 @@ typedef unsigned long pgprot_t; | |||
| 85 | #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) | 85 | #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) |
| 86 | #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) | 86 | #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) |
| 87 | #ifndef CONFIG_DISCONTIGMEM | 87 | #ifndef CONFIG_DISCONTIGMEM |
| 88 | #define pfn_to_page(pfn) (mem_map + (pfn)) | ||
| 89 | #define page_to_pfn(page) ((unsigned long)((page) - mem_map)) | ||
| 90 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 88 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
| 91 | 89 | ||
| 92 | #define pfn_valid(pfn) ((pfn) < max_mapnr) | 90 | #define pfn_valid(pfn) ((pfn) < max_mapnr) |
| @@ -95,9 +93,9 @@ typedef unsigned long pgprot_t; | |||
| 95 | 93 | ||
| 96 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 94 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 97 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 95 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 98 | |||
| 99 | #endif /* __KERNEL__ */ | 96 | #endif /* __KERNEL__ */ |
| 100 | 97 | ||
| 98 | #include <asm-generic/memory_model.h> | ||
| 101 | #include <asm-generic/page.h> | 99 | #include <asm-generic/page.h> |
| 102 | 100 | ||
| 103 | #endif /* _ALPHA_PAGE_H */ | 101 | #endif /* _ALPHA_PAGE_H */ |
