diff options
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/page-nommu.h | 4 | ||||
-rw-r--r-- | include/asm-arm/page.h | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-arm/page-nommu.h b/include/asm-arm/page-nommu.h index a1bcad060480..ea1cde84f500 100644 --- a/include/asm-arm/page-nommu.h +++ b/include/asm-arm/page-nommu.h | |||
@@ -7,6 +7,7 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | |||
10 | #ifndef _ASMARM_PAGE_NOMMU_H | 11 | #ifndef _ASMARM_PAGE_NOMMU_H |
11 | #define _ASMARM_PAGE_NOMMU_H | 12 | #define _ASMARM_PAGE_NOMMU_H |
12 | 13 | ||
@@ -42,9 +43,6 @@ typedef unsigned long pgprot_t; | |||
42 | #define __pmd(x) (x) | 43 | #define __pmd(x) (x) |
43 | #define __pgprot(x) (x) | 44 | #define __pgprot(x) (x) |
44 | 45 | ||
45 | /* to align the pointer to the (next) page boundary */ | ||
46 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
47 | |||
48 | extern unsigned long memory_start; | 46 | extern unsigned long memory_start; |
49 | extern unsigned long memory_end; | 47 | extern unsigned long memory_end; |
50 | 48 | ||
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 8e05bdb5f12f..7c5fc5582e5d 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
@@ -15,9 +15,6 @@ | |||
15 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 15 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
16 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 16 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
17 | 17 | ||
18 | /* to align the pointer to the (next) page boundary */ | ||
19 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
20 | |||
21 | #ifndef __ASSEMBLY__ | 18 | #ifndef __ASSEMBLY__ |
22 | 19 | ||
23 | #ifndef CONFIG_MMU | 20 | #ifndef CONFIG_MMU |