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-xtensa/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-xtensa/page.h')
-rw-r--r-- | include/asm-xtensa/page.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index 80a6ae0dd259..11f7dc2dbec7 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h | |||
@@ -26,13 +26,11 @@ | |||
26 | 26 | ||
27 | /* | 27 | /* |
28 | * PAGE_SHIFT determines the page size | 28 | * PAGE_SHIFT determines the page size |
29 | * PAGE_ALIGN(x) aligns the pointer to the (next) page boundary | ||
30 | */ | 29 | */ |
31 | 30 | ||
32 | #define PAGE_SHIFT 12 | 31 | #define PAGE_SHIFT 12 |
33 | #define PAGE_SIZE (__XTENSA_UL_CONST(1) << PAGE_SHIFT) | 32 | #define PAGE_SIZE (__XTENSA_UL_CONST(1) << PAGE_SHIFT) |
34 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 33 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
35 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE - 1) & PAGE_MASK) | ||
36 | 34 | ||
37 | #define PAGE_OFFSET XCHAL_KSEG_CACHED_VADDR | 35 | #define PAGE_OFFSET XCHAL_KSEG_CACHED_VADDR |
38 | #define MAX_MEM_PFN XCHAL_KSEG_SIZE | 36 | #define MAX_MEM_PFN XCHAL_KSEG_SIZE |