diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-22 12:02:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-22 12:02:30 -0700 |
| commit | 725e2d7ec8936462d638a146a1359a815f9a5def (patch) | |
| tree | 13695bc8451442f1a099fe37486e61a42580aded /include/linux/seqlock.h | |
| parent | dc912ba91b7e2fa74650a0fc22cccf0e0d50f371 (diff) | |
| parent | 41b43b6c6e30a832c790b010a06772e793bca193 (diff) | |
| download | linux-725e2d7ec8936462d638a146a1359a815f9a5def.tar.gz linux-725e2d7ec8936462d638a146a1359a815f9a5def.tar.bz2 linux-725e2d7ec8936462d638a146a1359a815f9a5def.zip | |
Merge tag 'locking-urgent-2023-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Fix a include/linux/atomic/atomic-arch-fallback.h breakage that
generated incorrect code, and fix a lockdep reporting race that may
result in lockups"
* tag 'locking-urgent-2023-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
locking/atomic: scripts: fix fallback ifdeffery
Diffstat (limited to 'include/linux/seqlock.h')
| -rw-r--r-- | include/linux/seqlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 987a59d977c5..e9bd2f65d7f4 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -512,8 +512,8 @@ do { \ static inline void do_write_seqcount_begin_nested(seqcount_t *s, int subclass) { - do_raw_write_seqcount_begin(s); seqcount_acquire(&s->dep_map, subclass, 0, _RET_IP_); + do_raw_write_seqcount_begin(s); } /** |