Commit 60d5ddea authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'liblockdep-fixes' of...

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: default avatarIngo Molnar <mingo@kernel.org>
parents a50750d4 2480257f
...@@ -14,9 +14,10 @@ define allow-override ...@@ -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
......
...@@ -28,6 +28,9 @@ ...@@ -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))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment