diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-10 13:08:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-01 07:06:23 -0400 |
commit | 0ba8b9b273c45dd23f60ff700e265a0069b33758 (patch) | |
tree | cb6aef90464889a27215cf9b7204c11b12e7c628 /arch/arm/mm/mmap.c | |
parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) |
[ARM] cputype: separate definitions, use them
Add asm/cputype.h, moving functions and definitions from asm/system.h
there. Convert all users of 'processor_id' to the more efficient
read_cpuid_id() function.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/mmap.c')
-rw-r--r-- | arch/arm/mm/mmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 3f6dc40b8353..28ead8393b5a 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
@@ -6,6 +6,7 @@ | |||
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 <asm/cputype.h> | ||
9 | #include <asm/system.h> | 10 | #include <asm/system.h> |
10 | 11 | ||
11 | #define COLOUR_ALIGN(addr,pgoff) \ | 12 | #define COLOUR_ALIGN(addr,pgoff) \ |
@@ -37,8 +38,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
37 | * caches alias. This is indicated by bits 9 and 21 of the | 38 | * caches alias. This is indicated by bits 9 and 21 of the |
38 | * cache type register. | 39 | * cache type register. |
39 | */ | 40 | */ |
40 | cache_type = read_cpuid(CPUID_CACHETYPE); | 41 | cache_type = read_cpuid_cachetype(); |
41 | if (cache_type != read_cpuid(CPUID_ID)) { | 42 | if (cache_type != read_cpuid_id()) { |
42 | aliasing = (cache_type | cache_type >> 12) & (1 << 11); | 43 | aliasing = (cache_type | cache_type >> 12) & (1 << 11); |
43 | if (aliasing) | 44 | if (aliasing) |
44 | do_align = filp || flags & MAP_SHARED; | 45 | do_align = filp || flags & MAP_SHARED; |