diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
| commit | 10e299fc6d596f4e8476d24ebba1495a8355baff (patch) | |
| tree | f7517eccba4dfc223113961c64429f3986afa8eb /include/asm-sh | |
| parent | cff93eb3d3244cc117a5204fe1d62102b506afb9 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index a5559e38744e..5a057b00f19a 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h | |||
| @@ -104,7 +104,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 104 | 104 | ||
| 105 | /* PFN start number, because of __MEMORY_START */ | 105 | /* PFN start number, because of __MEMORY_START */ |
| 106 | #define PFN_START (__MEMORY_START >> PAGE_SHIFT) | 106 | #define PFN_START (__MEMORY_START >> PAGE_SHIFT) |
| 107 | #define ARCH_PFN_OFFSET (FPN_START) | 107 | #define ARCH_PFN_OFFSET (PFN_START) |
| 108 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 108 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
| 109 | #define pfn_valid(pfn) (((pfn) - PFN_START) < max_mapnr) | 109 | #define pfn_valid(pfn) (((pfn) - PFN_START) < max_mapnr) |
| 110 | #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) | 110 | #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) |