Browse Source

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."

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar 10 years ago
parent
commit
60d5ddeabd
2 changed files with 5 additions and 1 deletions
  1. 2 1
      tools/lib/lockdep/Makefile
  2. 3 0
      tools/lib/lockdep/uinclude/linux/kernel.h

+ 2 - 1
tools/lib/lockdep/Makefile

@@ -14,9 +14,10 @@ define allow-override
     $(eval $(1) = $(2)))
     $(eval $(1) = $(2)))
 endef
 endef
 
 
-# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix.
+# Allow setting CC and AR and LD, or setting CROSS_COMPILE as a prefix.
 $(call allow-override,CC,$(CROSS_COMPILE)gcc)
 $(call allow-override,CC,$(CROSS_COMPILE)gcc)
 $(call allow-override,AR,$(CROSS_COMPILE)ar)
 $(call allow-override,AR,$(CROSS_COMPILE)ar)
+$(call allow-override,LD,$(CROSS_COMPILE)ld)
 
 
 INSTALL = install
 INSTALL = install
 
 

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

@@ -28,6 +28,9 @@
 #define __init
 #define __init
 #define noinline
 #define noinline
 #define list_add_tail_rcu list_add_tail
 #define list_add_tail_rcu list_add_tail
+#define list_for_each_entry_rcu list_for_each_entry
+#define barrier() 
+#define synchronize_sched()
 
 
 #ifndef CALLER_ADDR0
 #ifndef CALLER_ADDR0
 #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
 #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))