diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:37:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:37:51 +0200 |
| commit | e514130c11601a1fe6ef3a6f1715220dcbc124f0 (patch) | |
| tree | 4b6cc3a0319f1912ca2c129c304d4b8956637c86 /arch | |
| parent | 877cd7ae0d4cc5549ca3f9137ef7a3ee40b7a244 (diff) | |
| parent | 703ef76b8fd5169d5cff30de5b958d6728b9a147 (diff) | |
Merge tag 'renesas-soc2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Second Round of Renesas ARM Based SoC Updates for v4.15" from Simon Horman:
Fix to allow UP build of shmobile.
Arnd Bergmann says:
A bugfix for the SMP case broke the build for the UP case:
arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu':
(.text+0x34): undefined reference to `secondary_startup'
The assembler file mixes code that is used for SMP with code
that we also need on a single-CPU build, so I'm leaving it
always enabled in the Makefile, but enclose the SMP code
in an #ifdef.
* tag 'renesas-soc2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: rcar-gen2: fix non-SMP build
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp-apmu.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index db4743d2bf91..5672b5849401 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -31,7 +31,9 @@ ENTRY(shmobile_init_cntvoff) ret lr ENDPROC(shmobile_init_cntvoff) +#ifdef CONFIG_SMP ENTRY(shmobile_boot_apmu) bl shmobile_init_cntvoff b secondary_startup ENDPROC(shmobile_boot_apmu) +#endif |