Commit 29f12c48df4e6cba9df39dbe9d99649be27fb346
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core kernel fixes from Ingo Molnar: "Two liblockdep fixes and a CPU hotplug race fix" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tools/liblockdep: don't include host headers tools/liblockdep: ignore generated .so file smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()
Showing 3 changed files Side-by-side Diff
kernel/smpboot.c
| ... | ... | @@ -280,6 +280,7 @@ |
| 280 | 280 | unsigned int cpu; |
| 281 | 281 | int ret = 0; |
| 282 | 282 | |
| 283 | + get_online_cpus(); | |
| 283 | 284 | mutex_lock(&smpboot_threads_lock); |
| 284 | 285 | for_each_online_cpu(cpu) { |
| 285 | 286 | ret = __smpboot_create_thread(plug_thread, cpu); |
| ... | ... | @@ -292,6 +293,7 @@ |
| 292 | 293 | list_add(&plug_thread->list, &hotplug_threads); |
| 293 | 294 | out: |
| 294 | 295 | mutex_unlock(&smpboot_threads_lock); |
| 296 | + put_online_cpus(); | |
| 295 | 297 | return ret; |
| 296 | 298 | } |
| 297 | 299 | EXPORT_SYMBOL_GPL(smpboot_register_percpu_thread); |
tools/lib/lockdep/.gitignore
| 1 | +liblockdep.so.* |
tools/lib/lockdep/Makefile
| ... | ... | @@ -104,7 +104,7 @@ |
| 104 | 104 | |
| 105 | 105 | export Q VERBOSE |
| 106 | 106 | |
| 107 | -INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES) | |
| 107 | +INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES) | |
| 108 | 108 | |
| 109 | 109 | # Set compile option CFLAGS if not set elsewhere |
| 110 | 110 | CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g |