From patchwork Tue Mar 18 17:16:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3848771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5857FBF540 for ; Tue, 18 Mar 2014 17:19:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE6762037F for ; Tue, 18 Mar 2014 17:19:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EACE202FF for ; Tue, 18 Mar 2014 17:19:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxeW-00015p-6w; Tue, 18 Mar 2014 17:18:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxe2-0000no-TE; Tue, 18 Mar 2014 17:17:42 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxdM-0000hA-8r for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2014 17:17:04 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2N00FKV6NA7V90@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2014 17:16:22 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-f7-53287f65733d Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id B0.5A.18565.56F78235; Tue, 18 Mar 2014 17:16:21 +0000 (GMT) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N2N009RN6N5CJ00@eusync1.samsung.com>; Tue, 18 Mar 2014 17:16:21 +0000 (GMT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 3/6] ARM: EXYNOS: Fix compilation error in cpuidle.c Date: Tue, 18 Mar 2014 18:16:01 +0100 Message-id: <1395162964-5916-3-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.0 In-reply-to: <1395162964-5916-1-git-send-email-t.figa@samsung.com> References: <1395162964-5916-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphluLIzCtJLcpLzFFi42I5/e/4Zd3Ueo1gg7eP1Sz+TjrGbrHp+nVW i94FV9ks3h96xmyx6fE1VosZ5/cxWZy6/pnNYv2M1ywOHB6/f01i9LhzbQ+bx+Yl9R63/z1m 9rhyoonVo2/LKkaPz5vkAtijuGxSUnMyy1KL9O0SuDJu/LzCWHCOq+LxjF9MDYydnF2MHBwS AiYSN7stuhg5gUwxiQv31rN1MXJxCAksZZRY+n0JO4TTxyQx+ewbNpAqNgE1ic8Nj8BsEQFV ic9tC8CKmAW+Mkr8uPGEFSQhLOAucfnfBLAiFqCiqe/OMILYvAKOEssO9DBCrJOTmPIbpJmT g1PASeLJlAVgcSGgmicnr7BMYORdwMiwilE0tTS5oDgpPddIrzgxt7g0L10vOT93EyMk5L7u YFx6zOoQowAHoxIPr0SsRrAQa2JZcWXuIUYJDmYlEd7V7kAh3pTEyqrUovz4otKc1OJDjEwc nFINjMfTtgdyRnVWLsoru3Cn+Yj8zo6eM3Pk8z/O/f3VZKbn/99LvX+xtT1J+zZl32TBlDzt nCW5+ffrcnS2ZRw6t6PoS3iFhPOTeoVo0wqmu4tfXM8rOfk+dKNrnUWLy67LsxOC763Y6LSm dPcdphObIpijXbZpGbh3b9k+9dmUlLcpB6qLIk0EDyqxFGckGmoxFxUnAgB0h5VpFwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140318_131700_463329_2122154E X-CRM114-Status: UNSURE ( 9.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: Kukjin Kim , Arnd Bergmann , Mark Brown , Tomasz Figa , linaro-kernel@lists.linaro.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The big series refactoring Exynos suspend to RAM handling missed the cpuidle driver that is disabled in exynos_defconfig, leaving it including old mach/pm_core.h header and using old s3c_cpu_resume symbol instead of new exynos_cpu_resume, resulting in compilation failures with CONFIG_ARCH_EXYNOS and CONFIG_CPU_IDLE enabled. This patch fixes that silly mistake and performs necessary modification to arhc/arm/exynos/cpuidle.c to make it compile again. Signed-off-by: Tomasz Figa --- arch/arm/mach-exynos/cpuidle.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index f57cb91..b530231 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -26,7 +26,6 @@ #include #include -#include #include #include "common.h" @@ -127,7 +126,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, /* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf(SYS_AFTR); - __raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR); + __raw_writel(virt_to_phys(exynos_cpu_resume), REG_DIRECTGO_ADDR); __raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG); save_cpu_arch_register();