Skip to contentSkip to conversation

liblockdep fixes for v3.14

GIT PULL Sasha Levin 2 participants 3 messages Feb 5, 2014 – Feb 10, 2014

lore
Share & tools
lore
#0 lore raw

The following changes since commit 65370bdf881e20907e7a53abab9b8c0bc5f60a6b:

Merge branch 'linus' into core/locking (2014-02-02 09:43:20 +0100)

are available in the git repository at:

https://github.com/sashalevin/liblockdep.git liblockdep-fixes

for you to fetch changes up to a521b55af18ac72c969c1ba41b660d77dae37357:

liblockdep: add a stub for new rcu_is_watching (2014-02-05 18:03:54 -0500)

----------------------------------------------------------------
Ira W. Snyder (3):
tools: lockdep: fix initialization code path
tools: lockdep: fix include of asm/hash.h
tools: lockdep: add include directory to allow tests to compile

Sasha Levin (2):
liblockdep: mark runtests.sh as executable
liblockdep: add a stub for new rcu_is_watching

 tools/lib/lockdep/Makefile             | 2 +-
 tools/lib/lockdep/preload.c            | 2 +-
 tools/lib/lockdep/run_tests.sh         | 0
 tools/lib/lockdep/uinclude/asm/hash.h  | 6 ++++++
 tools/lib/lockdep/uinclude/linux/rcu.h | 5 +++++
 5 files changed, 13 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 tools/lib/lockdep/run_tests.sh
 create mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
tools/lib/lockdep/Makefile +1 -1
index da8b7aa..e8dd749 100644
@@ -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

tools/lib/lockdep/preload.c +1 -1
index f8465a8..23bd69c 100644
@@ -418,7 +418,7 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
 
 __attribute__((constructor)) static void init_preload(void)
 {
-	if (__init_state != done)
+	if (__init_state == done)
 		return;
 
 #ifndef __GLIBC__
tools/lib/lockdep/run_tests.sh +0 -0
old mode 100644
new mode 100755
tools/lib/lockdep/uinclude/asm/hash.h new file +6 -0
new file mode 100644
index 0000000..d82b170b
@@ -0,0 +1,6 @@
+#ifndef __ASM_GENERIC_HASH_H
+#define __ASM_GENERIC_HASH_H
+
+/* Stub */
+
+#endif /* __ASM_GENERIC_HASH_H */
tools/lib/lockdep/uinclude/linux/rcu.h +5 -0
index 4c99fcb..042ee8e 100644
@@ -13,4 +13,9 @@ static inline int rcu_is_cpu_idle(void)
 	return 1;
 }
 
+static inline bool rcu_is_watching(void)
+{
+	return false;
+}
+
 #endif
Acked-by Sasha Levin Acked-by Sasha Levin
#1 lore raw
Quoted 19 lines · Sasha Levin

The following changes since commit 65370bdf881e20907e7a53abab9b8c0bc5f60a6b:

Merge branch 'linus' into core/locking (2014-02-02 09:43:20 +0100)

are available in the git repository at:

https://github.com/sashalevin/liblockdep.git liblockdep-fixes

for you to fetch changes up to a521b55af18ac72c969c1ba41b660d77dae37357:

liblockdep: add a stub for new rcu_is_watching (2014-02-05 18:03:54 -0500)

----------------------------------------------------------------
Ira W. Snyder (3):
tools: lockdep: fix initialization code path
tools: lockdep: fix include of asm/hash.h
tools: lockdep: add include directory to allow tests to compile

Quoted 3 lines

Sasha Levin (2):
liblockdep: mark runtests.sh as executable
liblockdep: add a stub for new rcu_is_watching

So I have a couple of nits about the commits:

1)

Please use the following standard tags/prefixes:

tools/liblockdep: Fix initialization code path
...

and also capitalize sentences properly.

2)

Faulty SOB sequences:

Author: Ira W. Snyder <[email protected]>
Date: Fri Jan 31 13:35:32 2014 -0800

tools: lockdep: add include directory to allow tests to compile

That's not how we do signoffs, maintainer commits should be:

As a side note, that's not a valid Ack sequence either, which if done should be the other way around:

3)

It's not clear which patch you are referring to here:

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

It's neither in the series, nor in upstream.

Thanks,

Ingo

#2 lore raw
Quoted 62 lines · Ingo Molnar
Quoted 19 lines · Sasha Levin

The following changes since commit 65370bdf881e20907e7a53abab9b8c0bc5f60a6b:

   Merge branch 'linus' into core/locking (2014-02-02 09:43:20 +0100)

are available in the git repository at:

https://github.com/sashalevin/liblockdep.git liblockdep-fixes

for you to fetch changes up to a521b55af18ac72c969c1ba41b660d77dae37357:

liblockdep: add a stub for new rcu_is_watching (2014-02-05 18:03:54 -0500)

----------------------------------------------------------------
Ira W. Snyder (3):
tools: lockdep: fix initialization code path
tools: lockdep: fix include of asm/hash.h
tools: lockdep: add include directory to allow tests to compile

Quoted 3 lines

Sasha Levin (2):
liblockdep: mark runtests.sh as executable
liblockdep: add a stub for new rcu_is_watching

So I have a couple of nits about the commits:

1)

Please use the following standard tags/prefixes:

tools/liblockdep: Fix initialization code path
...

and also capitalize sentences properly.

2)

Faulty SOB sequences:

Author: Ira W. Snyder <[email protected]>
Date: Fri Jan 31 13:35:32 2014 -0800

tools: lockdep: add include directory to allow tests to compile

That's not how we do signoffs, maintainer commits should be:

As a side note, that's not a valid Ack sequence either, which if done should be the other way around:

Quoted 8 lines

3)

It's not clear which patch you are referring to here:

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

It's neither in the series, nor in upstream.

Thanks for the review Ingo, this was my first time doing a pull request. I'll fix everything and resend.

About 3, Arnaldo pulled that patch into -tip a week ago (https://lkml.org/lkml/2014/2/2/34).

Thanks,
Sasha