projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
include
/
linux
/
cpuhotplug.h
diff --git
a/include/linux/cpuhotplug.h
b/include/linux/cpuhotplug.h
index
a8ffc40
..
9b207a8
100644
(file)
--- a/
include/linux/cpuhotplug.h
+++ b/
include/linux/cpuhotplug.h
@@
-43,6
+43,8
@@
enum cpuhp_state {
CPUHP_CPUIDLE_COUPLED_PREPARE,
CPUHP_POWERPC_PMAC_PREPARE,
CPUHP_POWERPC_MMU_CTX_PREPARE,
+ CPUHP_XEN_PREPARE,
+ CPUHP_XEN_EVTCHN_PREPARE,
CPUHP_NOTIFY_PREPARE,
CPUHP_ARM_SHMOBILE_SCU_PREPARE,
CPUHP_SH_SH3X_PREPARE,