Commit 6ffa36a5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents aaed4d0b 6cfeaf51
#ifndef __CPUHOTPLUG_H #ifndef __CPUHOTPLUG_H
#define __CPUHOTPLUG_H #define __CPUHOTPLUG_H
#include <linux/types.h>
enum cpuhp_state { enum cpuhp_state {
CPUHP_OFFLINE, CPUHP_OFFLINE,
CPUHP_CREATE_THREADS, CPUHP_CREATE_THREADS,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment