diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 06:39:09 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 06:39:09 -1000 |
| commit | ca062f8df5d13e3a5c029449a12c20ac5069c094 (patch) | |
| tree | a5733e0740f9215d47ae98bfd181281b317c642c /tools | |
| parent | 3a5af36b6d0e4a42ec2a8552ace87edbe2a90ae4 (diff) | |
| parent | 0b405c65ad459f5f4d3db1672246172bd19d946d (diff) | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Misc fixes: liblockdep fixes and ww_mutex fixes"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/ww_mutex: Fix spelling mistake "cylic" -> "cyclic"
locking/lockdep: Delete unnecessary #include
tools/lib/lockdep: Add dummy task_struct state member
tools/lib/lockdep: Add empty nmi.h
tools/lib/lockdep: Update Sasha Levin email to MSFT
jump_label: Fix typo in warning message
locking/mutex: Fix mutex debug call and ww_mutex documentation
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/linux/lockdep.h | 3 | ||||
| -rw-r--r-- | tools/include/linux/nmi.h | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/include/linux/lockdep.h b/tools/include/linux/lockdep.h index 6b0c36a58fcb..e56997288f2b 100644 --- a/tools/include/linux/lockdep.h +++ b/tools/include/linux/lockdep.h @@ -30,9 +30,12 @@ struct task_struct { struct held_lock held_locks[MAX_LOCK_DEPTH]; gfp_t lockdep_reclaim_gfp; int pid; + int state; char comm[17]; }; +#define TASK_RUNNING 0 + extern struct task_struct *__curr(void); #define current (__curr()) diff --git a/tools/include/linux/nmi.h b/tools/include/linux/nmi.h new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tools/include/linux/nmi.h |