Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4f61eeb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux into next/soc 

Merge "Broadcom soc changes for 4.6" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC/platform changes:

- Masahiro updates the Broadcom Northstar Plus SMP operations to be annotated
  with const and __initconst

- Florian removes an unused variable in the Broadcom BCM63XX SMP code

* tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM63xx: Remove unused pmb_dn variable
  ARM: bcm: use const and __initconst for smp_operations
parents 7410bf1b 6580566e

arch/arm/mach-bcm/bcm63xx_pmb.c

+0 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static int bcm63xx_pmb_get_resources(struct device_node *dn, 
				     unsigned int *cpu,

				     unsigned int *addr)

{

	struct device_node *pmb_dn;

	struct of_phandle_args args;

	int ret;
@@ -109,7 +108,6 @@ static int bcm63xx_pmb_get_resources(struct device_node *dn, 
		return ret;

	}



	pmb_dn = args.np;

	if (args.args_count != 2) {

		pr_err("reset-controller does not conform to reset-cells\n");

		return -EINVAL;

arch/arm/mach-bcm/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static const struct smp_operations bcm_smp_ops __initconst = { 
CPU_METHOD_OF_DECLARE(bcm_smp_bcm281xx, "brcm,bcm11351-cpu-method",

			&bcm_smp_ops);



struct smp_operations nsp_smp_ops __initdata = {

static const struct smp_operations nsp_smp_ops __initconst = {

	.smp_prepare_cpus	= bcm_smp_prepare_cpus,

	.smp_boot_secondary	= nsp_boot_secondary,

};