xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'treewide/cleanup' into next/multiplatform

Browse Source 
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
This commit is contained in:
Arnd Bergmann
2015-12-18 17:07:52 +01:00
parent 3f93c644c9 e324654294
commit 11c7a6c5a3
94 changed files with 181 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/psci_smp.c
View File

@@ -120,7 +120,7 @@ bool __init psci_smp_available(void)
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,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_disable = psci_cpu_disable,