diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-03 10:48:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-03 10:48:48 -0800 |
commit | 148b59c60cd4a2745d8f727c2579cffe4a88afd8 (patch) | |
tree | ca8f53b1718b3e76cf4b6b5bf759c8e49028d762 /tools/lib/lockdep/uinclude | |
parent | 7abd42eab3d0a7fcdc01a19c987ef61e7fe451a4 (diff) | |
parent | 9b158f53a8da5394cb48310da9fda80b34c72bbc (diff) |
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
Diffstat (limited to 'tools/lib/lockdep/uinclude')
-rw-r--r-- | tools/lib/lockdep/uinclude/asm/hash.h | 6 | ||||
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/rcu.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/lib/lockdep/uinclude/asm/hash.h b/tools/lib/lockdep/uinclude/asm/hash.h new file mode 100644 index 00000000000..d82b170bb21 --- /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 */ diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/lib/lockdep/uinclude/linux/rcu.h index 4c99fcb5da2..042ee8e463c 100644 --- a/tools/lib/lockdep/uinclude/linux/rcu.h +++ b/tools/lib/lockdep/uinclude/linux/rcu.h @@ -13,4 +13,9 @@ static inline int rcu_is_cpu_idle(void) return 1; } +static inline bool rcu_is_watching(void) +{ + return false; +} + #endif |