diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 16:35:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 16:35:18 -0700 |
commit | d99d5917e7eff7308d11b76328102ad24d03af73 (patch) | |
tree | a58fe38873cf7e41a634aec610839ce437227569 /tools/lib/lockdep/uinclude/linux/lockdep.h | |
parent | 498f96204f27f47f1cfdcf498671025125b488d0 (diff) | |
parent | 65063ced73077b9add610b413d87bc6a51e40bab (diff) |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"liblockdep fixes and mutex debugging fixes"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/mutex: Fix debug_mutexes
tools/liblockdep: Add proper versioning to the shared obj
tools/liblockdep: Ignore asmlinkage and visible
Diffstat (limited to 'tools/lib/lockdep/uinclude/linux/lockdep.h')
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/lockdep.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h index d0f5d6e50214..c1552c28507e 100644 --- a/tools/lib/lockdep/uinclude/linux/lockdep.h +++ b/tools/lib/lockdep/uinclude/linux/lockdep.h @@ -10,6 +10,9 @@ #define MAX_LOCK_DEPTH 2000UL +#define asmlinkage +#define __visible + #include "../../../include/linux/lockdep.h" struct task_struct { |