Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 148b59c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull liblockdep fixes from Ingo Molnar:
 "A handful of build fixes for liblockdep"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/liblockdep: Use realpath for srctree and objtree
  tools/liblockdep: Add a stub for new rcu_is_watching
  tools/liblockdep: Mark runtests.sh as executable
  tools/liblockdep: Add include directory to allow tests to compile
  tools/liblockdep: Fix include of asm/hash.h
  tools/liblockdep: Fix initialization code path
parents 7abd42ea 9b158f53

tools/lib/lockdep/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ endif # BUILD_SRC 
# We process the rest of the Makefile if this is the final invocation of make

ifeq ($(skip-makefile),)



srctree		:= $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))

objtree		:= $(CURDIR)

srctree		:= $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)))

objtree		:= $(realpath $(CURDIR))

src		:= $(srctree)

obj		:= $(objtree)
@@ -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
Original line number Diff line number Diff line
@@ -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

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

tools/lib/lockdep/uinclude/asm/hash.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -13,4 +13,9 @@ static inline int rcu_is_cpu_idle(void) 
	return 1;

}



static inline bool rcu_is_watching(void)

{

	return false;

}



#endif