Merge branch 'core/urgent' into smp/hotplug to pick up dependencies

2016-07-13 17:03:30 +02:00
parent e1c4cde62b a7c734140a
commit e877bde234
2 changed files with 8 additions and 2 deletions
--- 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
 };