diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 11:47:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 11:47:03 +0200 |
| commit | 7c9026b2b054540bb25203eee1b073a32da84020 (patch) | |
| tree | 831c27df6dea611c595856772c4814cd6c6bf8e6 /fs | |
| parent | 200289db261f0c8131a5756133e9d30966289c3b (diff) | |
| parent | 1bf8012fc6997f2117f6919369cde16659db60e0 (diff) | |
| download | linux-7c9026b2b054540bb25203eee1b073a32da84020.tar.gz linux-7c9026b2b054540bb25203eee1b073a32da84020.tar.bz2 linux-7c9026b2b054540bb25203eee1b073a32da84020.zip | |
Merge tag 'pstore-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore updates from Kees Cook:
- ramoops: Fix .rst typo (Steven Rostedt)
- pstore: replace spinlock_t by raw_spinlock_t (Wen Yang)
* tag 'pstore-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: replace spinlock_t by raw_spinlock_t
pstore/ramoops: Fix typo as there is no "reserver"
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 3497ede88aa0..84719e2bcbc4 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -288,13 +288,13 @@ static void pstore_dump(struct kmsg_dumper *dumper, why = kmsg_dump_reason_str(reason); if (pstore_cannot_block_path(reason)) { - if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) { + if (!raw_spin_trylock_irqsave(&psinfo->buf_lock, flags)) { pr_err("dump skipped in %s path because of concurrent dump\n", in_nmi() ? "NMI" : why); return; } } else { - spin_lock_irqsave(&psinfo->buf_lock, flags); + raw_spin_lock_irqsave(&psinfo->buf_lock, flags); } kmsg_dump_rewind(&iter); @@ -364,7 +364,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, total += record.size; part++; } - spin_unlock_irqrestore(&psinfo->buf_lock, flags); + raw_spin_unlock_irqrestore(&psinfo->buf_lock, flags); if (saved_ret) { pr_err_once("backend (%s) writing error (%d)\n", psinfo->name, @@ -503,7 +503,7 @@ int pstore_register(struct pstore_info *psi) psi->write_user = pstore_write_user_compat; psinfo = psi; mutex_init(&psinfo->read_mutex); - spin_lock_init(&psinfo->buf_lock); + raw_spin_lock_init(&psinfo->buf_lock); if (psi->flags & PSTORE_FLAGS_DMESG) allocate_buf_for_compression(); |