diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-parisc/page.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-parisc/page.h')
| -rw-r--r-- | include/asm-parisc/page.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index 27d50b859541..c3941f09a878 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h | |||
| @@ -119,10 +119,6 @@ extern int npmem_ranges; | |||
| 119 | #define PMD_ENTRY_SIZE (1UL << BITS_PER_PMD_ENTRY) | 119 | #define PMD_ENTRY_SIZE (1UL << BITS_PER_PMD_ENTRY) |
| 120 | #define PTE_ENTRY_SIZE (1UL << BITS_PER_PTE_ENTRY) | 120 | #define PTE_ENTRY_SIZE (1UL << BITS_PER_PTE_ENTRY) |
| 121 | 121 | ||
| 122 | /* to align the pointer to the (next) page boundary */ | ||
| 123 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
| 124 | |||
| 125 | |||
| 126 | #define LINUX_GATEWAY_SPACE 0 | 122 | #define LINUX_GATEWAY_SPACE 0 |
| 127 | 123 | ||
| 128 | /* This governs the relationship between virtual and physical addresses. | 124 | /* This governs the relationship between virtual and physical addresses. |