Commit 7c9026b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 200289db 1bf8012f

Documentation/admin-guide/ramoops.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

    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

specifying RAM, be sure to reserve the memory by issuing memblock_reserve()

fs/pstore/platform.c

+4 −4
Original line number Diff line number Diff line
@@ -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();

include/linux/pstore.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ struct pstore_info { 
	struct module	*owner;

	const char	*name;



	spinlock_t	buf_lock;

	raw_spinlock_t	buf_lock;

	char		*buf;

	size_t		bufsize;