mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 04:41:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'renesas-soc2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Browse Source 
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
This commit is contained in:
Arnd Bergmann
2017-10-19 22:37:51 +02:00
parent 877cd7ae0d 703ef76b8f
commit e514130c11
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/headsmp-apmu.S
View File

@@ -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