xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2018-09-15 06:39:09 -10:00
parent 3a5af36b6d 0b405c65ad
commit ca062f8df5
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/include/linux/lockdep.h
View File

@@ -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())

0
tools/include/linux/nmi.h Normal file
View File