diff options
Diffstat (limited to 'arch/arm/mm/mmap.c')
-rw-r--r-- | arch/arm/mm/mmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 3f6dc40b8353..5358fcc7f61e 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
@@ -6,6 +6,8 @@ | |||
6 | #include <linux/mman.h> | 6 | #include <linux/mman.h> |
7 | #include <linux/shm.h> | 7 | #include <linux/shm.h> |
8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
9 | #include <linux/io.h> | ||
10 | #include <asm/cputype.h> | ||
9 | #include <asm/system.h> | 11 | #include <asm/system.h> |
10 | 12 | ||
11 | #define COLOUR_ALIGN(addr,pgoff) \ | 13 | #define COLOUR_ALIGN(addr,pgoff) \ |
@@ -37,8 +39,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
37 | * caches alias. This is indicated by bits 9 and 21 of the | 39 | * caches alias. This is indicated by bits 9 and 21 of the |
38 | * cache type register. | 40 | * cache type register. |
39 | */ | 41 | */ |
40 | cache_type = read_cpuid(CPUID_CACHETYPE); | 42 | cache_type = read_cpuid_cachetype(); |
41 | if (cache_type != read_cpuid(CPUID_ID)) { | 43 | if (cache_type != read_cpuid_id()) { |
42 | aliasing = (cache_type | cache_type >> 12) & (1 << 11); | 44 | aliasing = (cache_type | cache_type >> 12) & (1 << 11); |
43 | if (aliasing) | 45 | if (aliasing) |
44 | do_align = filp || flags & MAP_SHARED; | 46 | do_align = filp || flags & MAP_SHARED; |