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

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Browse Source 
Conflicts:
	init/main.c
	lib/Kconfig.debug

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2019-12-30 08:10:51 +01:00
parent 5cbaefe974 fd6988496e
commit 28336be568
11292 changed files with 565564 additions and 251471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/seqlock.h
View File

@@ -95,7 +95,7 @@ static inline void seqcount_lockdep_reader_access(const seqcount_t *s)
local_irq_save(flags);
seqcount_acquire_read(&l->dep_map, 0, 0, _RET_IP_);
seqcount_release(&l->dep_map, 1, _RET_IP_);
seqcount_release(&l->dep_map, _RET_IP_);
local_irq_restore(flags);
}
@@ -415,7 +415,7 @@ static inline void write_seqcount_begin(seqcount_t *s)
static inline void write_seqcount_end(seqcount_t *s)
{
seqcount_release(&s->dep_map, 1, _RET_IP_);
seqcount_release(&s->dep_map, _RET_IP_);
raw_write_seqcount_end(s);
}