renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-01 18:24:23 +08:00
Code

Second Round of Renesas ARM Based SoC Updates for v4.15

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZ3cuqAAoJENfPZGlqN0++DH0P/jqdIbnGM9TlXaAJ0zwJpucK
 Kmp/y9n4PNdyp1kglnLikOZQ72GXvH/DErbFEVA5p3o4iOxs+dgkf3KFI0+gIybD
 nPQO1oQqOkY/icuOG+PwR/7bAZtWQM/N2vJlwSCFJAz6X2n0dzoBqMjBni67vtXi
 V34GpzOF+R0JtTSSC5/xPoXyac57/7MxwJM1F/vG8ZPoVxerYlogrMr8mQD7LUmK
 IjdpKOjOktJpetvNBzS/hm0sWjSZ7+YAT0VwSyPMfqFbyP5iaWwfRN0TYpE2CRU7
 t54MNsfCbkCPBdgz4jhLbfSW4TFX5eQD233F/0Uj1J0CAwdOqsGa+lRffIK4EU9m
 Ihcp+JkGqRI0f8HAECO88Yne9xU1Covvt18E5OY7vxxq/9KkFNY/6m3IGoaTDZlP
 H14PRiA/ebX2hoqftNZtUDu423CogBCEsvzt5XEK/vfsRE7K9PY8m/qGSd2+JMqd
 XtgauQ+DBRQ/qIlJUTv8Lrkf/xVAWYVOz7wr+pLnHWJxL3+JFKol4eePs7xGHkUA
 cwl8T0r9/gd9L/w8onOA5u4amRXBJxS/mgTru1O26IKKoGwi5xw9c+bcbBkCGkBn
 PaZjVAd5gzlGzjEP2qIn8+qXH9UdAjlSLwmerDCWKhSMaXsDtuY6BVidRzGYEhOj
 4me8BOxi61OJWkiQ511T
 =EVGn
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-10-19 22:37:51 +02:00
commit e514130c11
1 changed files with 2 additions and 0 deletions
Show Stats 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