Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux into perf/urgent

Pull liblockdep fixes from Sasha Levin: "two fixes that deal with compilation errors in liblockdep."

Ingo Molnar committed 11 years ago

Commit 60d5dde2 parents a50750d 24802572 files · +5 −1Browse files

Unified · Split

2 files

tools/lib/lockdep/Makefile +2 −1
tools/lib/lockdep/uinclude/linux/kernel.h +3 −0

tools/lib/lockdep/Makefile+2−1

@@ -14,9 +14,10 @@ define allow-override · 13 unmodified lines
14	14	$(eval $(1) = $(2)))
15	15	endef
16	16
17		−# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix.
	17	+# Allow setting CC and AR and LD, or setting CROSS_COMPILE as a prefix.
18	18	$(call allow-override,CC,$(CROSS_COMPILE)gcc)
19	19	$(call allow-override,AR,$(CROSS_COMPILE)ar)
	20	+$(call allow-override,LD,$(CROSS_COMPILE)ld)
20	21
21	22	INSTALL = install
22	23

tools/lib/lockdep/uinclude/linux/kernel.h+3−0

@@ -28,6 +28,9 @@ · 27 unmodified lines
28	28	#define __init
29	29	#define noinline
30	30	#define list_add_tail_rcu list_add_tail
	31	+#define list_for_each_entry_rcu list_for_each_entry
	32	+#define barrier()
	33	+#define synchronize_sched()
31	34
32	35	#ifndef CALLER_ADDR0
33	36	#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))