From: kgene.kim@samsung•com (Kukjin Kim)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 3/6] ARM: EXYNOS: Fix compilation error in cpuidle.c
Date: Fri, 21 Mar 2014 03:01:12 +0900 [thread overview]
Message-ID: <532B2CE8.9090206@samsung.com> (raw)
In-Reply-To: <1395162964-5916-3-git-send-email-t.figa@samsung.com>
On 03/19/14 02:16, Tomasz Figa wrote:
> 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<t.figa@samsung•com>
> ---
> 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<plat/cpu.h>
> #include<plat/pm.h>
>
> -#include<mach/pm-core.h>
> #include<mach/map.h>
>
> #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();
OK, applied into s2r-pm-samsung-2 branch, thanks.
- Kukjin
next prev parent reply other threads:[~2014-03-20 18:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 17:15 [PATCH v2 1/6] serial: s3c: Fix build of header without serial_core.h preinclusion Tomasz Figa
2014-03-18 17:16 ` [PATCH v2 2/6] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion Tomasz Figa
2014-03-18 17:16 ` [PATCH v2 3/6] ARM: EXYNOS: Fix compilation error in cpuidle.c Tomasz Figa
2014-03-20 18:01 ` Kukjin Kim [this message]
2014-03-18 17:16 ` [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c Tomasz Figa
2014-03-20 18:08 ` Kukjin Kim
2014-03-18 17:16 ` [PATCH v2 5/6] ARM: s3c64xx: Fix incorrect selection of PM-related symbols Tomasz Figa
2014-03-20 18:20 ` Kukjin Kim
2014-03-18 17:16 ` [PATCH v2 6/6] ARM: s5p64x0: Explicitly include linux/serial_s3c.h in mach/pm-core.h Tomasz Figa
2014-03-20 18:35 ` Kukjin Kim
2014-03-20 17:52 ` [PATCH v2 1/6] serial: s3c: Fix build of header without serial_core.h preinclusion Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=532B2CE8.9090206@samsung.com \
--to=kgene.kim@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox