diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-03 13:48:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-03 13:48:48 -0500 |
commit | 148b59c60cd4a2745d8f727c2579cffe4a88afd8 (patch) | |
tree | ca8f53b1718b3e76cf4b6b5bf759c8e49028d762 /tools/lib/lockdep/uinclude/linux/rcu.h | |
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/linux/rcu.h')
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/rcu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/lib/lockdep/uinclude/linux/rcu.h index 4c99fcb5da27..042ee8e463c9 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) | |||
13 | return 1; | 13 | return 1; |
14 | } | 14 | } |
15 | 15 | ||
16 | static inline bool rcu_is_watching(void) | ||
17 | { | ||
18 | return false; | ||
19 | } | ||
20 | |||
16 | #endif | 21 | #endif |