NotificationsYou must be signed in to change notification settings
Fork0
Star2

Commit855cf1e

committed

Merge tag 'locking-urgent-2020-11-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fix from Thomas Gleixner: "A single fix for lockdep which makes the recursion protection cover graph lock/unlock"* tag 'locking-urgent-2020-11-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep: Put graph lock/unlock under lock_recursion protection

2 parents68d3fa2 +43be438 commit855cf1eCopy full SHA for 855cf1e

File tree

1 file changed

-2

lines changed

kernel/locking
- lockdep.c

1 file changed

-2

lines changed

`‎kernel/locking/lockdep.c‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,19 +108,21 @@ static inline void lockdep_lock(void)`
`108`	`108`	`{`
`109`	`109`	`DEBUG_LOCKS_WARN_ON(!irqs_disabled());`
`110`	`110`
	`111`	`+__this_cpu_inc(lockdep_recursion);`
`111`	`112`	`arch_spin_lock(&__lock);`
`112`	`113`	`__owner=current;`
`113`		`-__this_cpu_inc(lockdep_recursion);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`staticinlinevoidlockdep_unlock(void)`
`117`	`117`	`{`
	`118`	`+DEBUG_LOCKS_WARN_ON(!irqs_disabled());`
	`119`	`+`
`118`	`120`	`if (debug_locks&&DEBUG_LOCKS_WARN_ON(__owner!=current))`
`119`	`121`	`return;`
`120`	`122`
`121`		`-__this_cpu_dec(lockdep_recursion);`
`122`	`123`	`__owner=NULL;`
`123`	`124`	`arch_spin_unlock(&__lock);`
	`125`	`+__this_cpu_dec(lockdep_recursion);`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`staticinlineboollockdep_assert_locked(void)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit855cf1e

File tree

1 file changed

1 file changed

`‎kernel/locking/lockdep.c‎`

0 commit comments