diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 17:35:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 17:35:07 +0200 |
| commit | 351267d941bffeddfaa55ba05c77f971b9f67cfe (patch) | |
| tree | f3eff3a74a5e1ff95c3fb72a9e442322dd7910f5 /kernel | |
| parent | Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | cpu/hotplug: Use distinct name for cpu_hotplug.dep_map (diff) | |
| download | linux-351267d941bffeddfaa55ba05c77f971b9f67cfe.tar.xz linux-351267d941bffeddfaa55ba05c77f971b9f67cfe.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc fixes from Ingo Molnar:
"A CPU hotplug debuggability fix and three objtool false positive
warnings fixes for new GCC6 code generation patterns"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Use distinct name for cpu_hotplug.dep_map
objtool: Skip all "unreachable instruction" warnings for gcov kernels
objtool: Improve rare switch jump table pattern detection
objtool: Support '-mtune=atom' stack frame setup instruction
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 5df20d6d1520..29de1a9352c0 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -228,7 +228,7 @@ static struct { .wq = __WAIT_QUEUE_HEAD_INITIALIZER(cpu_hotplug.wq), .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock), #ifdef CONFIG_DEBUG_LOCK_ALLOC - .dep_map = {.name = "cpu_hotplug.lock" }, + .dep_map = STATIC_LOCKDEP_MAP_INIT("cpu_hotplug.dep_map", &cpu_hotplug.dep_map), #endif }; |