| From koba@kmckk.co.jp Mon Sep 24 22:10:10 2012 |
| From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Date: Tue, 25 Sep 2012 14:07:56 +0900 |
| Subject: [PATCH 20/21] ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n |
| To: greg@kroah.com |
| Cc: ltsi-dev@lists.linuxfoundation.org, horms@verge.net.au, damm@opensource.se, kuninori.morimoto.gx@renesas.com, Arnd Bergmann <arnd@arndb.de>, Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Message-ID: <1348549677-1458-21-git-send-email-koba@kmckk.co.jp> |
| |
| |
| From: Magnus Damm <damm@opensource.se> |
| |
| Fix build error in the case of SMP=y but ARCH_SH73A0=n |
| introduced by: |
| |
| 9601e87 ARM: shmobile: fix smp build |
| |
| The use of of_machine_is_compatible() will link in the |
| the SoC-specific symbols: |
| "sh73a0_get_core_count", "sh73a0_smp_prepare_cpus", |
| "sh73a0_secondary_init" and "sh73a0_boot_secondary". |
| |
| This patch adds an ugly #ifdef wrapper as a stop-gap |
| solution. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Tested-by: Tested-by: Simon Horman <horms@verge.net.au> |
| Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| (cherry picked from commit 873e9f7a3b8a5ca36085437da364654bfe3e5974) |
| |
| Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| --- |
| arch/arm/mach-shmobile/platsmp.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c |
| index 5a2b69c..932ac8f 100644 |
| --- a/arch/arm/mach-shmobile/platsmp.c |
| +++ b/arch/arm/mach-shmobile/platsmp.c |
| @@ -21,8 +21,13 @@ |
| #include <asm/mach-types.h> |
| #include <mach/common.h> |
| |
| +#ifdef CONFIG_ARCH_SH73A0 |
| #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \ |
| of_machine_is_compatible("renesas,sh73a0")) |
| +#else |
| +#define is_sh73a0() (0) |
| +#endif |
| + |
| #define is_r8a7779() machine_is_marzen() |
| |
| static unsigned int __init shmobile_smp_get_core_count(void) |
| -- |
| 1.7.9.5 |
| |
