diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-12-17 19:12:47 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-17 19:12:47 -0500 |
commit | 255d1f8639f5877381545d0da6821079ebad1c21 (patch) | |
tree | 8351dbb473602e4b837160e813db8c883c889f60 /arch | |
parent | 994adcc36d8c2133fce01f4d3fe4e41007555913 (diff) |
[ARM] Fix warnings from asm/system.h
Move adjust_cr() into arch/arm/mm/mmu.c, and move irqflags.h to
a more appropriate place in the header file.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mm/mmu.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index f028aef9a861..655c8376f0b5 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -154,6 +154,26 @@ static int __init noalign_setup(char *__unused) | |||
154 | } | 154 | } |
155 | __setup("noalign", noalign_setup); | 155 | __setup("noalign", noalign_setup); |
156 | 156 | ||
157 | #ifndef CONFIG_SMP | ||
158 | void adjust_cr(unsigned long mask, unsigned long set) | ||
159 | { | ||
160 | unsigned long flags; | ||
161 | |||
162 | mask &= ~CR_A; | ||
163 | |||
164 | set &= mask; | ||
165 | |||
166 | local_irq_save(flags); | ||
167 | |||
168 | cr_no_alignment = (cr_no_alignment & ~mask) | set; | ||
169 | cr_alignment = (cr_alignment & ~mask) | set; | ||
170 | |||
171 | set_cr((get_cr() & ~mask) | set); | ||
172 | |||
173 | local_irq_restore(flags); | ||
174 | } | ||
175 | #endif | ||
176 | |||
157 | struct mem_types { | 177 | struct mem_types { |
158 | unsigned int prot_pte; | 178 | unsigned int prot_pte; |
159 | unsigned int prot_l1; | 179 | unsigned int prot_l1; |