diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-02-03 06:22:18 -0500 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-04-19 20:40:06 -0400 |
commit | e573ebb0326f2f4a29ee2bd143bfc88ab0332926 (patch) | |
tree | 26d041a57b3d25ea612d52559d201d0fe76e43c8 /include | |
parent | 3a4e832cccc5baba98ba010e38c58266954228a7 (diff) |
avr32: cleanup - use _AC macro to define PAGE_SIZE
PAGE_SIZE is used both from assembly and C code. We want to have type
specifiers when using it from C, but this will make the assembler
confused, so we need to make it conditional.
This is exactly what the _AC macro is for, so using it allows us to
get rid of a few lines of cpp noise.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-avr32/page.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-avr32/page.h b/include/asm-avr32/page.h index 5582968feee8..cbbc5ca9728b 100644 --- a/include/asm-avr32/page.h +++ b/include/asm-avr32/page.h | |||
@@ -8,13 +8,11 @@ | |||
8 | #ifndef __ASM_AVR32_PAGE_H | 8 | #ifndef __ASM_AVR32_PAGE_H |
9 | #define __ASM_AVR32_PAGE_H | 9 | #define __ASM_AVR32_PAGE_H |
10 | 10 | ||
11 | #include <linux/const.h> | ||
12 | |||
11 | /* PAGE_SHIFT determines the page size */ | 13 | /* PAGE_SHIFT determines the page size */ |
12 | #define PAGE_SHIFT 12 | 14 | #define PAGE_SHIFT 12 |
13 | #ifdef __ASSEMBLY__ | 15 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) |
14 | #define PAGE_SIZE (1 << PAGE_SHIFT) | ||
15 | #else | ||
16 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | ||
17 | #endif | ||
18 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 16 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
19 | #define PTE_MASK PAGE_MASK | 17 | #define PTE_MASK PAGE_MASK |
20 | 18 | ||