diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 11:30:17 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 16:16:30 -0400 |
commit | 9601e87388f4969a80b021a40215d24c4e78d5b3 (patch) | |
tree | b01d79681370c362b733152ded02331588d89f9b | |
parent | 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f (diff) |
ARM: shmobile: fix smp build
I got build errors with the new version now because machine_is_kzm9g is no longer
defined:
arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible'
Replace the missing function with a call to of_machine_is_compatible.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Acked-by: Magnus Damm <magnus.damm@gmail.com>
-rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts index ed1bae5a24f1..bcb911951978 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "KZM-A9-GT"; | 15 | model = "KZM-A9-GT"; |
16 | compatible = "renesas,kzm9g"; | 16 | compatible = "renesas,kzm9g", "renesas,sh73a0"; |
17 | 17 | ||
18 | memory { | 18 | memory { |
19 | device_type = "memory"; | 19 | device_type = "memory"; |
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index d959f07d1ef0..5a2b69cf5ba6 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c | |||
@@ -16,11 +16,13 @@ | |||
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/of.h> | ||
19 | #include <asm/hardware/gic.h> | 20 | #include <asm/hardware/gic.h> |
20 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
21 | #include <mach/common.h> | 22 | #include <mach/common.h> |
22 | 23 | ||
23 | #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) | 24 | #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \ |
25 | of_machine_is_compatible("renesas,sh73a0")) | ||
24 | #define is_r8a7779() machine_is_marzen() | 26 | #define is_r8a7779() machine_is_marzen() |
25 | 27 | ||
26 | static unsigned int __init shmobile_smp_get_core_count(void) | 28 | static unsigned int __init shmobile_smp_get_core_count(void) |