Commit 29f12c48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 2af613d3 135818bf

kernel/smpboot.c

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread) 
	unsigned int cpu;

	int ret = 0;



	get_online_cpus();

	mutex_lock(&smpboot_threads_lock);

	for_each_online_cpu(cpu) {

		ret = __smpboot_create_thread(plug_thread, cpu);
@@ -292,6 +293,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread) 
	list_add(&plug_thread->list, &hotplug_threads);

out:

	mutex_unlock(&smpboot_threads_lock);

	put_online_cpus();

	return ret;

}

EXPORT_SYMBOL_GPL(smpboot_register_percpu_thread);

tools/lib/lockdep/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
liblockdep.so.*

tools/lib/lockdep/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ N = 


export Q VERBOSE



INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)

INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)



# Set compile option CFLAGS if not set elsewhere

CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g

CRA Git | Maintained and supported by SUSTech CRA and CCSE