Skip to content

Commit 7c9026b

Browse files
committed
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"
2 parents 200289d + 1bf8012 commit 7c9026b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Documentation/admin-guide/ramoops.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Setting the ramoops parameters can be done in several different manners:
129129
takes a size, alignment and name as arguments. The name is used
130130
to map the memory to a label that can be retrieved by ramoops.
131131

132-
reserver_mem=2M:4096:oops ramoops.mem_name=oops
132+
reserve_mem=2M:4096:oops ramoops.mem_name=oops
133133

134134
You can specify either RAM memory or peripheral devices' memory. However, when
135135
specifying RAM, be sure to reserve the memory by issuing memblock_reserve()

fs/pstore/platform.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,13 @@ static void pstore_dump(struct kmsg_dumper *dumper,
288288
why = kmsg_dump_reason_str(reason);
289289

290290
if (pstore_cannot_block_path(reason)) {
291-
if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) {
291+
if (!raw_spin_trylock_irqsave(&psinfo->buf_lock, flags)) {
292292
pr_err("dump skipped in %s path because of concurrent dump\n",
293293
in_nmi() ? "NMI" : why);
294294
return;
295295
}
296296
} else {
297-
spin_lock_irqsave(&psinfo->buf_lock, flags);
297+
raw_spin_lock_irqsave(&psinfo->buf_lock, flags);
298298
}
299299

300300
kmsg_dump_rewind(&iter);
@@ -364,7 +364,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
364364
total += record.size;
365365
part++;
366366
}
367-
spin_unlock_irqrestore(&psinfo->buf_lock, flags);
367+
raw_spin_unlock_irqrestore(&psinfo->buf_lock, flags);
368368

369369
if (saved_ret) {
370370
pr_err_once("backend (%s) writing error (%d)\n", psinfo->name,
@@ -503,7 +503,7 @@ int pstore_register(struct pstore_info *psi)
503503
psi->write_user = pstore_write_user_compat;
504504
psinfo = psi;
505505
mutex_init(&psinfo->read_mutex);
506-
spin_lock_init(&psinfo->buf_lock);
506+
raw_spin_lock_init(&psinfo->buf_lock);
507507

508508
if (psi->flags & PSTORE_FLAGS_DMESG)
509509
allocate_buf_for_compression();

include/linux/pstore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ struct pstore_info {
182182
struct module *owner;
183183
const char *name;
184184

185-
spinlock_t buf_lock;
185+
raw_spinlock_t buf_lock;
186186
char *buf;
187187
size_t bufsize;
188188

0 commit comments

Comments
 (0)