summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-13 20:01:14 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-06-02 10:20:14 +0200
commitc6e13600d3b2137ff583767d7f8688a41e34ac49 (patch)
tree9fdab44f06cedb04f6c6712731706eaecace5539
parentARM: move "noalign" command line option to alignment.c (diff)
downloadlinux-c6e13600d3b2137ff583767d7f8688a41e34ac49.tar.xz
linux-c6e13600d3b2137ff583767d7f8688a41e34ac49.zip
ARM: remove unused adjust_cr() function
adjust_cr() is not used anymore, so let's get rid of it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/include/asm/cp15.h4
-rw-r--r--arch/arm/mm/mmu.c20
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h
index 63427266015d..ebae45d7f017 100644
--- a/arch/arm/include/asm/cp15.h
+++ b/arch/arm/include/asm/cp15.h
@@ -80,10 +80,6 @@ static inline void set_auxcr(unsigned int val)
isb();
}
-#ifndef CONFIG_SMP
-extern void adjust_cr(unsigned long mask, unsigned long set);
-#endif
-
#define CPACC_FULL(n) (3 << (n * 2))
#define CPACC_SVC(n) (1 << (n * 2))
#define CPACC_DISABLE(n) (0 << (n * 2))
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index ec57f792aed4..9c8fec02c274 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -186,26 +186,6 @@ static int __init early_ecc(char *p)
early_param("ecc", early_ecc);
#endif
-#ifndef CONFIG_SMP
-void adjust_cr(unsigned long mask, unsigned long set)
-{
- unsigned long flags;
-
- mask &= ~CR_A;
-
- set &= mask;
-
- local_irq_save(flags);
-
- cr_no_alignment = (cr_no_alignment & ~mask) | set;
- cr_alignment = (cr_alignment & ~mask) | set;
-
- set_cr((get_cr() & ~mask) | set);
-
- local_irq_restore(flags);
-}
-#endif
-
#else /* ifdef CONFIG_CPU_CP15 */
static int __init early_cachepolicy(char *p)