korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 12:11:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

pstore updates for v6.12-rc1

Browse Source 
- ramoops: Fix .rst typo (Steven Rostedt)
 
 - pstore: replace spinlock_t by raw_spinlock_t (Wen Yang)
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRSPkdeREjth1dHnSE2KwveOeQkuwUCZufrKwAKCRA2KwveOeQk
 u0PQAQDtABDUAMyV9kgAG3nU9L0En+p8s+rF+9MJLDmFEnmjkQD8C7ky6cW74/3R
 b56tAsSsuFMuHdx4AGGD7rAWrnVUswc=
 =HNdN
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2024-09-18 11:47:03 +02:00
commit 7c9026b2b0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/admin-guide/ramoops.rst
View File

@ -129,7 +129,7 @@ Setting the ramoops parameters can be done in several different manners:
takes a size, alignment and name as arguments. The name is used takes a size, alignment and name as arguments. The name is used
to map the memory to a label that can be retrieved by ramoops. to map the memory to a label that can be retrieved by ramoops.
reserver_mem=2M:4096:oops ramoops.mem_name=oops reserve_mem=2M:4096:oops ramoops.mem_name=oops
You can specify either RAM memory or peripheral devices' memory. However, when You can specify either RAM memory or peripheral devices' memory. However, when
specifying RAM, be sure to reserve the memory by issuing memblock_reserve() specifying RAM, be sure to reserve the memory by issuing memblock_reserve()

8
fs/pstore/platform.c
View File

@ -288,13 +288,13 @@ static void pstore_dump(struct kmsg_dumper *dumper,
why = kmsg_dump_reason_str(reason); why = kmsg_dump_reason_str(reason);
if (pstore_cannot_block_path(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", pr_err("dump skipped in %s path because of concurrent dump\n",
in_nmi() ? "NMI" : why); in_nmi() ? "NMI" : why);
return; return;
} }
} else { } else {
spin_lock_irqsave(&psinfo->buf_lock, flags); raw_spin_lock_irqsave(&psinfo->buf_lock, flags);
} }
kmsg_dump_rewind(&iter); kmsg_dump_rewind(&iter);
@ -364,7 +364,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
total += record.size; total += record.size;
part++; part++;
} }
spin_unlock_irqrestore(&psinfo->buf_lock, flags); raw_spin_unlock_irqrestore(&psinfo->buf_lock, flags);
if (saved_ret) { if (saved_ret) {
pr_err_once("backend (%s) writing error (%d)\n", psinfo->name, 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; psi->write_user = pstore_write_user_compat;
psinfo = psi; psinfo = psi;
mutex_init(&psinfo->read_mutex); mutex_init(&psinfo->read_mutex);
spin_lock_init(&psinfo->buf_lock); raw_spin_lock_init(&psinfo->buf_lock);
if (psi->flags & PSTORE_FLAGS_DMESG) if (psi->flags & PSTORE_FLAGS_DMESG)
allocate_buf_for_compression(); allocate_buf_for_compression();

2
include/linux/pstore.h
View File

@ -182,7 +182,7 @@ struct pstore_info {
struct module *owner; struct module *owner;
const char *name; const char *name;
spinlock_t buf_lock; raw_spinlock_t buf_lock;
char *buf; char *buf;
size_t bufsize; size_t bufsize;