diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-15 08:43:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-15 08:43:15 +0200 |
| commit | 60d5ddeabdda2d6453280efcf172d2429da10eac (patch) | |
| tree | dd20b21e91ff44b5588838641294054296c9e438 | |
| parent | a50750d4dc577c8a49a1eaa8e50727513a0c9c05 (diff) | |
| parent | 2480257fb17ba0fdaf62bc8c2406bd08d5e7f8f1 (diff) | |
| download | linux-60d5ddeabdda2d6453280efcf172d2429da10eac.tar.bz2 | |
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>
| -rw-r--r-- | tools/lib/lockdep/Makefile | 3 | ||||
| -rw-r--r-- | tools/lib/lockdep/uinclude/linux/kernel.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile index 0c356fb65022..18ffccf00426 100644 --- a/tools/lib/lockdep/Makefile +++ b/tools/lib/lockdep/Makefile @@ -14,9 +14,10 @@ define allow-override $(eval $(1) = $(2))) 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,AR,$(CROSS_COMPILE)ar) +$(call allow-override,LD,$(CROSS_COMPILE)ld) INSTALL = install diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h index a11e3c357be7..cd2cc59a5da7 100644 --- a/tools/lib/lockdep/uinclude/linux/kernel.h +++ b/tools/lib/lockdep/uinclude/linux/kernel.h @@ -28,6 +28,9 @@ #define __init #define noinline #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 #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) |