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/soc

Browse Source 
Merge in cleanup to avoid internal conflicts with newly added code.

* 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

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2015-12-22 13:10:00 -08:00
parent 9cdac4a20a e324654294
commit 8907dbaa36
94 changed files with 181 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-zynq/Kconfig
View File

@@ -1,5 +1,6 @@
config ARCH_ZYNQ
bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
bool "Xilinx Zynq ARM Cortex A9 Platform"
depends on ARCH_MULTI_V7
select ARCH_HAS_RESET_CONTROLLER
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA

2
arch/arm/mach-zynq/common.h
View File

@@ -30,7 +30,7 @@ extern char zynq_secondary_trampoline;
extern char zynq_secondary_trampoline_jump;
extern char zynq_secondary_trampoline_end;
extern int zynq_cpun_start(u32 address, int cpu);
extern struct smp_operations zynq_smp_ops __initdata;
extern const struct smp_operations zynq_smp_ops;
#endif
extern void __iomem *zynq_scu_base;

2
arch/arm/mach-zynq/platsmp.c
View File

@@ -157,7 +157,7 @@ static void zynq_cpu_die(unsigned int cpu)
}
#endif
struct smp_operations zynq_smp_ops __initdata = {
const struct smp_operations zynq_smp_ops __initconst = {
.smp_init_cpus = zynq_smp_init_cpus,
.smp_prepare_cpus = zynq_smp_prepare_cpus,
.smp_boot_secondary = zynq_boot_secondary,