2014-01-31 21:45:09

by Ira W. Snyder

[permalink] [raw]
Subject: [PATCH 0/2] tools: lockdep: build fixes

From: "Ira W. Snyder" <[email protected]>

Included are some fixes to the tools/lib/lockdep source tree to fix some
build issues.

Ira W. Snyder (2):
tools: lockdep: fix include of asm/hash.h
tools: lockdep: add include directory to allow tests to compile

tools/lib/lockdep/Makefile | 2 +-
tools/lib/lockdep/uinclude/asm/hash.h | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 tools/lib/lockdep/uinclude/asm/hash.h

--
1.8.3.2


2014-01-31 21:45:07

by Ira W. Snyder

[permalink] [raw]
Subject: [PATCH 1/2] tools: lockdep: fix include of asm/hash.h

From: "Ira W. Snyder" <[email protected]>

Commit 71ae8aac ("lib: introduce arch optimized hash library")
added an include to <linux/hash.h> for setting up an architecture
specific fast hash.

This patch mirrors the fix used for perf, titled "tools: perf: util: fix
include for non x86 architectures".

Signed-off-by: Ira W. Snyder <[email protected]>
---
tools/lib/lockdep/uinclude/asm/hash.h | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 tools/lib/lockdep/uinclude/asm/hash.h

diff --git a/tools/lib/lockdep/uinclude/asm/hash.h b/tools/lib/lockdep/uinclude/asm/hash.h
new file mode 100644
index 000000000000..d82b170bb216
--- /dev/null
+++ b/tools/lib/lockdep/uinclude/asm/hash.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_GENERIC_HASH_H
+#define __ASM_GENERIC_HASH_H
+
+/* Stub */
+
+#endif /* __ASM_GENERIC_HASH_H */
--
1.8.3.2

2014-01-31 21:45:06

by Ira W. Snyder

[permalink] [raw]
Subject: [PATCH 2/2] tools: lockdep: add include directory to allow tests to compile

From: "Ira W. Snyder" <[email protected]>

All of the programs in the tests directory require the
liblockdep/mutex.h header in order to compile. Add the include directory
to the compiler options so that the tests can be built with the provided
Makefile.

Signed-off-by: Ira W. Snyder <[email protected]>
---
tools/lib/lockdep/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index da8b7aa3d351..e8dd7497f57a 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -112,7 +112,7 @@ export Q VERBOSE

LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION)

-INCLUDES = -I. -I/usr/local/include -I./uinclude $(CONFIG_INCLUDES)
+INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES)

# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
--
1.8.3.2

2014-02-04 03:17:10

by Sasha Levin

[permalink] [raw]
Subject: Re: [PATCH 0/2] tools: lockdep: build fixes

On 01/31/2014 04:35 PM, Ira W. Snyder wrote:
> From: "Ira W. Snyder" <[email protected]>
>
> Included are some fixes to the tools/lib/lockdep source tree to fix some
> build issues.
>
> Ira W. Snyder (2):
> tools: lockdep: fix include of asm/hash.h
> tools: lockdep: add include directory to allow tests to compile
>
> tools/lib/lockdep/Makefile | 2 +-
> tools/lib/lockdep/uinclude/asm/hash.h | 6 ++++++
> 2 files changed, 7 insertions(+), 1 deletion(-)
> create mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
>

Acked-by: Sasha Levin <[email protected]>


Ingo, How would you like the liblockdep things to work? Would you be picking them
yourself directly to the locking tree or should I be sending a pull request?


Thanks,
Sasha

2014-02-04 09:16:03

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH 0/2] tools: lockdep: build fixes


* Sasha Levin <[email protected]> wrote:

> On 01/31/2014 04:35 PM, Ira W. Snyder wrote:
> >From: "Ira W. Snyder" <[email protected]>
> >
> >Included are some fixes to the tools/lib/lockdep source tree to fix some
> >build issues.
> >
> >Ira W. Snyder (2):
> > tools: lockdep: fix include of asm/hash.h
> > tools: lockdep: add include directory to allow tests to compile
> >
> > tools/lib/lockdep/Makefile | 2 +-
> > tools/lib/lockdep/uinclude/asm/hash.h | 6 ++++++
> > 2 files changed, 7 insertions(+), 1 deletion(-)
> > create mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
> >
>
> Acked-by: Sasha Levin <[email protected]>
>
> Ingo, How would you like the liblockdep things to work? Would you be
> picking them yourself directly to the locking tree or should I be
> sending a pull request?

Let's try a pull request? Initially it might need several iterations
(rebasing) as the requirements for pull requests are always much more
stringent, as I cannot fix up small details.

Thanks,

Ingo