diff options
| -rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 4bbea3639910..e3ebc20ed0a7 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig | |||
| @@ -31,13 +31,15 @@ CONFIG_ARM_ERRATA_743622=y | |||
| 31 | CONFIG_ARM_ERRATA_754322=y | 31 | CONFIG_ARM_ERRATA_754322=y |
| 32 | CONFIG_NO_HZ=y | 32 | CONFIG_NO_HZ=y |
| 33 | CONFIG_HIGH_RES_TIMERS=y | 33 | CONFIG_HIGH_RES_TIMERS=y |
| 34 | CONFIG_SMP=y | ||
| 35 | CONFIG_SCHED_MC=y | ||
| 34 | CONFIG_PREEMPT=y | 36 | CONFIG_PREEMPT=y |
| 35 | CONFIG_AEABI=y | 37 | CONFIG_AEABI=y |
| 36 | # CONFIG_OABI_COMPAT is not set | 38 | # CONFIG_OABI_COMPAT is not set |
| 37 | CONFIG_HIGHMEM=y | 39 | CONFIG_HIGHMEM=y |
| 38 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 40 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 39 | CONFIG_ZBOOT_ROM_BSS=0x0 | 41 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 40 | CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=serial" | 42 | CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200" |
| 41 | CONFIG_KEXEC=y | 43 | CONFIG_KEXEC=y |
| 42 | CONFIG_VFP=y | 44 | CONFIG_VFP=y |
| 43 | CONFIG_NEON=y | 45 | CONFIG_NEON=y |
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index 45fa3924c6a1..d959f07d1ef0 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <mach/common.h> | 21 | #include <mach/common.h> |
| 22 | 22 | ||
| 23 | #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2()) | 23 | #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) |
| 24 | #define is_r8a7779() machine_is_marzen() | 24 | #define is_r8a7779() machine_is_marzen() |
| 25 | 25 | ||
| 26 | static unsigned int __init shmobile_smp_get_core_count(void) | 26 | static unsigned int __init shmobile_smp_get_core_count(void) |
