summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-21 16:32:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-24 08:48:43 +0100
commit14cd8fd574bce1cfbe510ccb1f73c7c1024d770f (patch)
treed50ddf743969ac54898b3cc3053c52bfa95d1690 /arch/arm/mach-sa1100
parente8856a8797e76e6883ae81f8f9ecbb231cc535df (diff)
downloadblackbird-op-linux-14cd8fd574bce1cfbe510ccb1f73c7c1024d770f.tar.gz
blackbird-op-linux-14cd8fd574bce1cfbe510ccb1f73c7c1024d770f.zip
ARM: pm: move cpu_init() call into core code
As we have core code dealing with CPU suspend/resume, we can re-initialize the CPUs exception banked registers via that code rather than having platforms deal with that level of detail. So, move the call to cpu_init() out of platform code into core code. Tested-by: Kevin Hilman <khilman@ti.com> Acked-by: Jean Pihet <j-pihet@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/pm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index c4661aab22fb..d35885ca97a1 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -77,8 +77,6 @@ static int sa11x0_pm_enter(suspend_state_t state)
/* go zzz */
sa1100_cpu_suspend(PLAT_PHYS_OFFSET - PAGE_OFFSET);
- cpu_init();
-
/*
* Ensure not to come back here if it wasn't intended
*/
OpenPOWER on IntegriCloud