summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-13 17:03:30 +0200
committerThomas Gleixner <tglx@linutronix.de>2016-07-13 17:03:30 +0200
commite877bde234ee8e7aa73b8b3e3f1f67bc99c9b034 (patch)
tree64f2fd39a34e0a9223278e8b2a7a40887d77abe5 /kernel
parente1c4cde62b230c1110ac8e3552898c8582679c6f (diff)
parenta7c734140aa36413944eef0f8c660e0e2256357d (diff)
Merge branch 'core/urgent' into smp/hotplug to pick up dependencies
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpu.c2
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
};