aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-07-17 12:02:10 +0100
committerJon Medhurst <tixy@linaro.org>2013-07-17 12:02:10 +0100
commit08f87fd1f8d4c4bb7bc2473e63e01841997575a0 (patch)
tree6653602147d661512b94fcb032b536b705d76508 /drivers
parent20b22bdf99d678c928dc67fc9b24181e44975329 (diff)
parent6821d4bd29c8d13206ea30b5dbc07d446b1d5018 (diff)
Merge branch 'tracking-armlt-dcscb' into lsk-3.10-vexpress
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpuidle/cpuidle-calxeda.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c
index 223379169cb0..0e6e408c0a63 100644
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -37,20 +37,6 @@
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
extern void *scu_base_addr;
-static inline unsigned int get_auxcr(void)
-{
- unsigned int val;
- asm("mrc p15, 0, %0, c1, c0, 1 @ get AUXCR" : "=r" (val) : : "cc");
- return val;
-}
-
-static inline void set_auxcr(unsigned int val)
-{
- asm volatile("mcr p15, 0, %0, c1, c0, 1 @ set AUXCR"
- : : "r" (val) : "cc");
- isb();
-}
-
static noinline void calxeda_idle_restore(void)
{
set_cr(get_cr() | CR_C);