diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-22 05:24:47 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-22 05:24:47 +0300 |
commit | fd2d7a4a354539dc141f702c6c277bf3380e8778 (patch) | |
tree | def206b0a2ac582b1d95f259fb3ffad32f3e17cb /include | |
parent | b7a801f3956f0c1409d0ece07feb9a2ff78cd15b (diff) | |
parent | 8126b1c73108bc691f5643df19071a59a69d0bc6 (diff) | |
download | linux-fd2d7a4a354539dc141f702c6c277bf3380e8778.tar.xz |
Merge tag 'pstore-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore updates from Kees Cook:
- Don't use semaphores in always-atomic-context code (Jann Horn)
- Add "ECC:" prefix to ECC messages (Vincent Whitchurch)
* tag 'pstore-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: Don't use semaphores in always-atomic-context code
pstore: Add prefix to ECC messages
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pstore.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index eb93a54cff31..e97a8188f0fd 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -14,7 +14,7 @@ #include <linux/errno.h> #include <linux/kmsg_dump.h> #include <linux/mutex.h> -#include <linux/semaphore.h> +#include <linux/spinlock.h> #include <linux/time.h> #include <linux/types.h> @@ -87,7 +87,7 @@ struct pstore_record { * @owner: module which is responsible for this backend driver * @name: name of the backend driver * - * @buf_lock: semaphore to serialize access to @buf + * @buf_lock: spinlock to serialize access to @buf * @buf: preallocated crash dump buffer * @bufsize: size of @buf available for crash dump bytes (must match * smallest number of bytes available for writing to a @@ -178,7 +178,7 @@ struct pstore_info { struct module *owner; const char *name; - struct semaphore buf_lock; + spinlock_t buf_lock; char *buf; size_t bufsize; |