aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-05-09 14:06:56 +0100
committerJon Medhurst <tixy@linaro.org>2013-05-09 14:06:56 +0100
commit3bc528d32c5c98a496c3473353e701a6e23c0cb3 (patch)
treeb76e5ff2770d6259f3e1e4b29f52f36ede6c4214 /drivers
parent7d101db765ff1df9ef09503d80a725d8b4880d85 (diff)
parent23c5ac41ee7db68b1d64e75e641f026e8f1afe97 (diff)
Merge branch 'tracking-armlt-dcscb' into lsk-3.9-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 e1aab38c5a8..ece83d6e049 100644
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -37,20 +37,6 @@ extern void *scu_base_addr;
static struct cpuidle_device __percpu *calxeda_idle_cpuidle_devices;
-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);