diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 12:47:03 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 12:47:03 +0300 |
commit | 7c9026b2b054540bb25203eee1b073a32da84020 (patch) | |
tree | 831c27df6dea611c595856772c4814cd6c6bf8e6 /include | |
parent | 200289db261f0c8131a5756133e9d30966289c3b (diff) | |
parent | 1bf8012fc6997f2117f6919369cde16659db60e0 (diff) | |
download | linux-7c9026b2b054540bb25203eee1b073a32da84020.tar.xz |
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 'include')
-rw-r--r-- | include/linux/pstore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 638507a3c8ff..fed601053c51 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -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; |