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

Commit 11c7a6c5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'treewide/cleanup' into next/multiplatform 

The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Conflicts:
	arch/arm/mach-integrator/Kconfig
parents 3f93c644 e3246542

arch/arm/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -697,7 +697,8 @@ config ARCH_MULTI_CPU_AUTO 
endmenu

endmenu





config ARCH_VIRT

config ARCH_VIRT

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	bool "Dummy Virtual Machine"

	depends on ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_AMBA

	select ARM_GIC

	select ARM_GIC

	select ARM_GIC_V3

	select ARM_GIC_V3

arch/arm/common/mcpm_platsmp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ static void mcpm_cpu_die(unsigned int cpu) 




#endif

#endif





static struct smp_operations __initdata mcpm_smp_ops = {

static const struct smp_operations mcpm_smp_ops __initconst = {

	.smp_boot_secondary	= mcpm_boot_secondary,

	.smp_boot_secondary	= mcpm_boot_secondary,

	.smp_secondary_init	= mcpm_secondary_init,

	.smp_secondary_init	= mcpm_secondary_init,

#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

arch/arm/include/asm/psci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef __ASM_ARM_PSCI_H

#ifndef __ASM_ARM_PSCI_H

#define __ASM_ARM_PSCI_H

#define __ASM_ARM_PSCI_H





extern struct smp_operations psci_smp_ops;

extern const struct smp_operations psci_smp_ops;





#ifdef CONFIG_ARM_PSCI

#ifdef CONFIG_ARM_PSCI

bool psci_smp_available(void);

bool psci_smp_available(void);

arch/arm/kernel/psci_smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ bool __init psci_smp_available(void) 
	return (psci_ops.cpu_on != NULL);

	return (psci_ops.cpu_on != NULL);

}

}





struct smp_operations __initdata psci_smp_ops = {

const struct smp_operations psci_smp_ops __initconst = {

	.smp_boot_secondary	= psci_boot_secondary,

	.smp_boot_secondary	= psci_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_disable		= psci_cpu_disable,

	.cpu_disable		= psci_cpu_disable,

arch/arm/mach-alpine/Kconfig

+2 −1
Original line number Original line Diff line number Diff line 
config ARCH_ALPINE

config ARCH_ALPINE

	bool "Annapurna Labs Alpine platform" if ARCH_MULTI_V7

	bool "Annapurna Labs Alpine platform"

	depends on ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_AMBA

	select ARM_GIC

	select ARM_GIC

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP