diff options
| author | Thomas Gleixner | 2019-06-26 16:45:49 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-06-26 16:45:49 +0200 |
| commit | a57e8e1982cc0e4631772c52218548432974de58 (patch) | |
| tree | 12c71ffb948ece626ad072e84a3c82b1f36cbaf8 /include/linux | |
| parent | timekeeping: Boot should be boottime for coarse ns accessor (diff) | |
| parent | Merge branch 'timers/drivers/davinci' into timers/drivers/next (diff) | |
| download | kernel-qcow2-linux-a57e8e1982cc0e4631772c52218548432974de58.tar.gz kernel-qcow2-linux-a57e8e1982cc0e4631772c52218548432974de58.tar.xz kernel-qcow2-linux-a57e8e1982cc0e4631772c52218548432974de58.zip | |
Merge tag 'timers-v5.4' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/events updates from Daniel Lezcano:
- Rewrite of the davinci timer resulting to an immutable branch to be
shared with davinci platform specific tree (Bartosz Golaszewski)
- Cleanup and improvements of the tegra timer (Dmitry Osipenko)
- Add new nxp system counter timer (Bai Ping)
- Increase priority for exynos_mct to take over the initialization
of the IP the arch ARM timer depends on (Marek Szyprowski)
- Change macro use _BITUL() by BIT() on arc timer (Masahiro Yamada)
- Implement the delay timer on ixp4xx (Linus Walleij)
- Add the SPDX license identifier on the meson timer (Neil Armstrong)
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuhotplug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 5c6062206760..87c211adf49e 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -116,10 +116,10 @@ enum cpuhp_state { CPUHP_AP_PERF_ARM_ACPI_STARTING, CPUHP_AP_PERF_ARM_STARTING, CPUHP_AP_ARM_L2X0_STARTING, + CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING, CPUHP_AP_ARM_ARCH_TIMER_STARTING, CPUHP_AP_ARM_GLOBAL_TIMER_STARTING, CPUHP_AP_JCORE_TIMER_STARTING, - CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING, CPUHP_AP_ARM_TWD_STARTING, CPUHP_AP_QCOM_TIMER_STARTING, CPUHP_AP_TEGRA_TIMER_STARTING, |