diff options
| author | Thomas Gleixner | 2016-07-13 17:03:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2016-07-13 17:03:30 +0200 |
| commit | e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034 (patch) | |
| tree | 64f2fd39a34e0a9223278e8b2a7a40887d77abe5 /kernel | |
| parent | Merge branch 'core/rcu' into smp/hotplug to pick up dependencies (diff) | |
| parent | cpu/hotplug: Keep enough storage space if SMP=n to avoid array out of bounds ... (diff) | |
| download | kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.tar.gz kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.tar.xz kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.zip | |
Merge branch 'core/urgent' into smp/hotplug to pick up dependencies
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index d948e44c471e..7b61887f7ccd 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1201,6 +1201,8 @@ static struct cpuhp_step cpuhp_bp_states[] = { .teardown = takedown_cpu, .cant_stop = true, }, +#else + [CPUHP_BRINGUP_CPU] = { }, #endif }; |