diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-07-18 08:36:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-18 08:36:21 -0700 |
| commit | 07167d8a4ec89f8e140a6a3bf9e42d32ea10622f (patch) | |
| tree | 4a1d71299efeb552e9f03d8d01576788df16a049 /include/linux | |
| parent | Merge tag 'pxa-for-4.19-v2' of https://github.com/rjarzmik/linux into next/soc (diff) | |
| parent | ARM: mvebu: convert secondary CPU clock sync to hotplug state (diff) | |
Merge tag 'mvebu-arm-4.19-1' of git://git.infradead.org/linux-mvebu into next/soc
mvebu arm for 4.19 (part 1)
- remove potential call from invalid context in boot_secondary
- allow using CONFIG_FORTIFY_SOURCE in pmsu.c
* tag 'mvebu-arm-4.19-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: convert secondary CPU clock sync to hotplug state
ARM: mvebu: declare asm symbols as character arrays in pmsu.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuhotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 8796ba387152..fa54e5fbea38 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -143,6 +143,7 @@ enum cpuhp_state { CPUHP_AP_SMPBOOT_THREADS, CPUHP_AP_X86_VDSO_VMA_ONLINE, CPUHP_AP_IRQ_AFFINITY_ONLINE, + CPUHP_AP_ARM_MVEBU_SYNC_CLOCKS, CPUHP_AP_PERF_ONLINE, CPUHP_AP_PERF_X86_ONLINE, CPUHP_AP_PERF_X86_UNCORE_ONLINE, |