ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled

Gitweb:     http://git.kernel.org/linus/;a=commit;h=6ae42bb22b40254e6488bbfe47f970620ab6d433
Commit:     6ae42bb22b40254e6488bbfe47f970620ab6d433
Parent:     4d6344f3c943a5ff1fd8dcbd7be61ebdef1d0285
Author:     Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj <at> renesas.com>
AuthorDate: Wed Jun 20 11:30:41 2012 +0200
Committer:  Rafael J. Wysocki <rjw <at> sisk.pl>
CommitDate: Wed Jun 20 11:30:41 2012 +0200

    ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled

    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 <at> renesas.com>
    Acked-by: Simon Horman <horms <at> verge.net.au>
    Acked-by: Magnus Damm <damm <at> opensource.se>
    Signed-off-by: Rafael J. Wysocki <rjw <at> sisk.pl>
---
 arch/arm/mach-shmobile/platsmp.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index bacdd66..e859fcd 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
 <at>  <at>  -25,7 +25,12  <at>  <at> 
 #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \
 			of_machine_is_compatible("renesas,sh73a0"))
 #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)
 {
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html