Merge tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux into next/cleanup

Browse source

Merge "Broadcom SoC changes for 4.3 (part 1)" from Florian Fainelli:

This pull request contains two fixes for the Broadcom BCM63xx SMP code:

- Sudeep removes an invalid use of cpu_logical_map() which turned to be a no-op
  since we always boot from physical CPU 0 = logical CPU 0

- Florian removes the custom secondary_startup function and replaces it with
  the generic one

* tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux:
  ARM: BCM63xx: Remove custom secondary_startup function
  ARM: BCM63xx: fix parameter to of_get_cpu_node in bcm63138_smp_boot_secondary

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2015-07-17 10:19:04 -07:00

parent 3bf7b20a0e ffb910d7b8

commit 6339189e9f

4 changed files with 3 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/mach-bcm/Makefile

View file

23

arch/arm/mach-bcm/bcm63xx_headsmp.S

View file

4

arch/arm/mach-bcm/bcm63xx_smp.c

View file

1

arch/arm/mach-bcm/bcm63xx_smp.h

View file