diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-25 09:24:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-25 09:24:35 +0200 |
| commit | 4fedcde7026835a05b44aab388d4bb95f3226286 (patch) | |
| tree | 34973e941bd797fda73c9251f112a95c135d738e /include/linux | |
| parent | 515f0453752e3daba7c47d37d9172a66509a56fd (diff) | |
| parent | ea136a112d89bade596314a1ae49f748902f4727 (diff) | |
Merge branch 'x86/urgent' into x86/cache
Pick up pending upstream fixes to meet dependencies
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 6a381594608c..5c6062206760 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -101,6 +101,7 @@ enum cpuhp_state { CPUHP_AP_IRQ_BCM2836_STARTING, CPUHP_AP_IRQ_MIPS_GIC_STARTING, CPUHP_AP_ARM_MVEBU_COHERENCY, + CPUHP_AP_MICROCODE_LOADER, CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING, CPUHP_AP_PERF_X86_STARTING, CPUHP_AP_PERF_X86_AMD_IBS_STARTING, |