diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-18 11:38:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-18 11:38:46 -0700 |
| commit | 6ffa36a59a01691cc8823ef1113e328bb84c14de (patch) | |
| tree | 63f81a2d04658d6000ce5edf2d39d06bbbc18136 | |
| parent | aaed4d0bddaef70640fa8ac0d52a380e2d3c6101 (diff) | |
| parent | 6cfeaf5125d425043d44002d0a1a8a147be582bf (diff) | |
| download | talos-obmc-linux-6ffa36a59a01691cc8823ef1113e328bb84c14de.tar.gz talos-obmc-linux-6ffa36a59a01691cc8823ef1113e328bb84c14de.zip | |
Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull SMP build fixlet from Thomas Gleixner:
"Add a missing include in cpuhotplug.h"
* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Include linux/types.h in linux/cpuhotplug.h
| -rw-r--r-- | include/linux/cpuhotplug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 242bf530edfc..34bd80512a0c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -1,6 +1,8 @@ #ifndef __CPUHOTPLUG_H #define __CPUHOTPLUG_H +#include <linux/types.h> + enum cpuhp_state { CPUHP_OFFLINE, CPUHP_CREATE_THREADS, |
