projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[profile/ivi/kernel-x86-ivi.git]
/
arch
/
arm
/
mach-exynos
/
cpuidle.c
diff --git
a/arch/arm/mach-exynos/cpuidle.c
b/arch/arm/mach-exynos/cpuidle.c
index
4ddda91
..
0509241
100644
(file)
--- a/
arch/arm/mach-exynos/cpuidle.c
+++ b/
arch/arm/mach-exynos/cpuidle.c
@@
-117,7
+117,8
@@
static int exynos4_enter_core0_aftr(struct cpuidle_device *dev,
cpu_suspend(0, idle_finisher);
#ifdef CONFIG_SMP
- scu_enable(S5P_VA_SCU);
+ if (!soc_is_exynos5250())
+ scu_enable(S5P_VA_SCU);
#endif
cpu_pm_exit();