| From koba@kmckk.co.jp Wed Oct 3 04:30:37 2012 |
| From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Date: Wed, 3 Oct 2012 20:23:18 +0900 |
| Subject: [PATCH 26/26] ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled |
| To: greg@kroah.com |
| Cc: ltsi-dev@lists.linuxfoundation.org, horms@verge.net.au, damm@opensource.se, Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>, "Rafael J. Wysocki" <rjw@sisk.pl>, Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Message-ID: <1349263398-13152-27-git-send-email-koba@kmckk.co.jp> |
| |
| |
| From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| |
| Build failed, when SMP is enabled and EMEV2 is not enabled. |
| |
| arch/arm/mach-shmobile/built-in.o: In function `shmobile_platform_cpu_kill': |
| /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:62: undefined reference to `emev2_platform_cpu_kill' |
| arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_get_core_count': |
| /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:39: undefined reference to `emev2_get_core_count' |
| arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_prepare_cpus': |
| /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:53: undefined reference to `emev2_smp_prepare_cpus' |
| arch/arm/mach-shmobile/built-in.o: In function `platform_secondary_init': |
| /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:78: undefined reference to `emev2_secondary_init' |
| arch/arm/mach-shmobile/built-in.o: In function `boot_secondary': |
| /home/iwamatsu/work/kernel/sh-2.6-devel/arch/arm/mach-shmobile/platsmp.c:90: undefined reference to `emev2_boot_secondary |
| |
| This is the cause by when EMEV2 is disabled, that the check by OF of EMEV2 is |
| performed in platsmp.c. |
| This patch revise what the function about EMEV2 may not be used in this file, |
| when EMEV2 is not enabled. |
| |
| Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| Acked-by: Simon Horman <horms@verge.net.au> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit 6ae42bb22b40254e6488bbfe47f970620ab6d433) |
| |
| Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| --- |
| arch/arm/mach-shmobile/platsmp.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/arch/arm/mach-shmobile/platsmp.c |
| +++ b/arch/arm/mach-shmobile/platsmp.c |
| @@ -30,7 +30,12 @@ |
| #endif |
| |
| #define is_r8a7779() machine_is_marzen() |
| + |
| +#ifdef CONFIG_ARCH_EMEV2 |
| #define is_emev2() of_machine_is_compatible("renesas,emev2") |
| +#else |
| +#define is_emev2() (0) |
| +#endif |
| |
| static unsigned int __init shmobile_smp_get_core_count(void) |
| { |
