diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /include/asm-arm/page.h | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'include/asm-arm/page.h')
| -rw-r--r-- | include/asm-arm/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index af9c3fe7588c..7e85db77d99b 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
| @@ -11,13 +11,13 @@ | |||
| 11 | #define _ASMARM_PAGE_H | 11 | #define _ASMARM_PAGE_H |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | ||
| 15 | |||
| 14 | /* PAGE_SHIFT determines the page size */ | 16 | /* PAGE_SHIFT determines the page size */ |
| 15 | #define PAGE_SHIFT 12 | 17 | #define PAGE_SHIFT 12 |
| 16 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 18 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
| 17 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 19 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
| 18 | 20 | ||
| 19 | #ifdef __KERNEL__ | ||
| 20 | |||
| 21 | /* to align the pointer to the (next) page boundary */ | 21 | /* to align the pointer to the (next) page boundary */ |
| 22 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 22 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) |
| 23 | 23 | ||