diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-13 13:57:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-02 04:20:11 -0400 |
commit | b4b20ad881f5a5c19ae9199547ddbb00fa4825eb (patch) | |
tree | e493f9f397590561e452a7eee1aa83e2fa8c0d28 /arch/arm/mm/init.c | |
parent | 4585eaff634b1bbb09686895221b3645f53f7a60 (diff) |
ARM: provide common method to clear bits in CPU control register
Several places open-code this manipulation, let's consolidate this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r-- | arch/arm/mm/init.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 2a77ba8796ae..94332b1ad4bc 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/dma-contiguous.h> | 23 | #include <linux/dma-contiguous.h> |
24 | #include <linux/sizes.h> | 24 | #include <linux/sizes.h> |
25 | 25 | ||
26 | #include <asm/cp15.h> | ||
26 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
27 | #include <asm/memblock.h> | 28 | #include <asm/memblock.h> |
28 | #include <asm/prom.h> | 29 | #include <asm/prom.h> |
@@ -36,6 +37,15 @@ | |||
36 | 37 | ||
37 | #include "mm.h" | 38 | #include "mm.h" |
38 | 39 | ||
40 | #ifdef CONFIG_CPU_CP15_MMU | ||
41 | unsigned long __init __clear_cr(unsigned long mask) | ||
42 | { | ||
43 | cr_no_alignment = cr_no_alignment & ~mask; | ||
44 | cr_alignment = cr_alignment & ~mask; | ||
45 | return cr_alignment; | ||
46 | } | ||
47 | #endif | ||
48 | |||
39 | static phys_addr_t phys_initrd_start __initdata = 0; | 49 | static phys_addr_t phys_initrd_start __initdata = 0; |
40 | static unsigned long phys_initrd_size __initdata = 0; | 50 | static unsigned long phys_initrd_size __initdata = 0; |
41 | 51 | ||