diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-s390/page.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-s390/page.h')
| -rw-r--r-- | include/asm-s390/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index 12fd9c4f0f15..991ba939408c 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h | |||
| @@ -138,9 +138,6 @@ void arch_alloc_page(struct page *page, int order); | |||
| 138 | 138 | ||
| 139 | #endif /* !__ASSEMBLY__ */ | 139 | #endif /* !__ASSEMBLY__ */ |
| 140 | 140 | ||
| 141 | /* to align the pointer to the (next) page boundary */ | ||
| 142 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
| 143 | |||
| 144 | #define __PAGE_OFFSET 0x0UL | 141 | #define __PAGE_OFFSET 0x0UL |
| 145 | #define PAGE_OFFSET 0x0UL | 142 | #define PAGE_OFFSET 0x0UL |
| 146 | #define __pa(x) (unsigned long)(x) | 143 | #define __pa(x) (unsigned long)(x) |