diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:27:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:27:27 +0200 |
| commit | f6b2dae76e0e138f8b4b6c375f10d2f8272982be (patch) | |
| tree | 8c05f9c7add039c47225a0f3a4dab5a02598977a /arch/arm/mach-shmobile | |
| parent | Merge tag 'arm-soc/for-4.9/soc' of http://github.com/Broadcom/stblinux into n... (diff) | |
| parent | ARM: shmobile: r8a7791: only use smp_init when SMP is selected (diff) | |
| download | linux-f6b2dae76e0e138f8b4b6c375f10d2f8272982be.tar.xz linux-f6b2dae76e0e138f8b4b6c375f10d2f8272982be.zip | |
Merge tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Updates for v4.9" from Simon Horman:
Clean-up:
* Only use smp_init when SMP is selected
Enablement:
* Add debug-ll support for r8a7992
* tag 'renesas-soc-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7791: only use smp_init when SMP is selected
ARM: shmobile: r8a7790: only use smp_init when SMP is selected
ARM: debug-ll: Add support for r8a7992
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7791.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 3506327e0bed..78d3e859bd64 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -28,7 +28,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") - .smp_init = shmobile_smp_init_fallback_ops, + .smp_init = smp_init_ops(shmobile_smp_init_fallback_ops), .smp = smp_ops(r8a7790_smp_ops), .init_early = shmobile_init_delay, .init_time = rcar_gen2_timer_init, diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c index 110e8b588e56..26e2d181a190 100644 --- a/arch/arm/mach-shmobile/setup-r8a7791.c +++ b/arch/arm/mach-shmobile/setup-r8a7791.c @@ -29,7 +29,7 @@ static const char *const r8a7791_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)") - .smp_init = shmobile_smp_init_fallback_ops, + .smp_init = smp_init_ops(shmobile_smp_init_fallback_ops), .smp = smp_ops(r8a7791_smp_ops), .init_early = shmobile_init_delay, .init_time = rcar_gen2_timer_init, |