diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 00:57:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 00:57:24 -0500 |
| commit | 135818bf494e6f8f7c9327d9d9e015f7548b6f8d (patch) | |
| tree | 556520b2e70e914019b8c3bf8c06ed7e0be32716 | |
| parent | 4bee96860a65c3a62d332edac331b3cf936ba3ad (diff) | |
| parent | 8baeccdcb8e51bfb0f3349fc8f90abe8d5654f9e (diff) | |
Merge branch 'liblockdep-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux into core/urgent
Pull liblockdep fixes from Sasha Levin.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/lib/lockdep/.gitignore | 1 | ||||
| -rw-r--r-- | tools/lib/lockdep/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/lockdep/.gitignore b/tools/lib/lockdep/.gitignore new file mode 100644 index 000000000000..cc0e7a9f99e3 --- /dev/null +++ b/tools/lib/lockdep/.gitignore | |||
| @@ -0,0 +1 @@ | |||
| liblockdep.so.* | |||
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile index 52f9279c6c13..4b866c54f624 100644 --- a/tools/lib/lockdep/Makefile +++ b/tools/lib/lockdep/Makefile | |||
| @@ -104,7 +104,7 @@ N = | |||
| 104 | 104 | ||
| 105 | export Q VERBOSE | 105 | export Q VERBOSE |
| 106 | 106 | ||
| 107 | INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES) | 107 | INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES) |
| 108 | 108 | ||
| 109 | # Set compile option CFLAGS if not set elsewhere | 109 | # Set compile option CFLAGS if not set elsewhere |
| 110 | CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g | 110 | CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g |