From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 27 May 2014 16:15:11 +0000 (+0900)
Subject: Merge branch 'v3.16-next/non-critical-fixes' into for-next
X-Git-Tag: next-20140530~113^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=516d7508f6a5de06e5e82743d9706d57208b408f;p=karo-tx-linux.git

Merge branch 'v3.16-next/non-critical-fixes' into for-next
---

516d7508f6a5de06e5e82743d9706d57208b408f
diff --cc arch/arm/mach-exynos/hotplug.c
index 69fa48397394,03cdcd39f71c..8a134d019cb3
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@@ -44,15 -96,9 +44,9 @@@ static inline void platform_do_lowpower
  
  		/* make cpu1 to be turned off at next WFI command */
  		if (cpu == 1)
 -			__raw_writel(0, S5P_ARM_CORE1_CONFIGURATION);
 +			exynos_cpu_power_down(cpu);
  
- 		/*
- 		 * here's the WFI
- 		 */
- 		asm(".word	0xe320f003\n"
- 		    :
- 		    :
- 		    : "memory", "cc");
+ 		wfi();
  
  		if (pen_release == cpu_logical_map(cpu)) {
  			/*