diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 11:47:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 11:47:03 +0200 |
| commit | 7c9026b2b054540bb25203eee1b073a32da84020 (patch) | |
| tree | 831c27df6dea611c595856772c4814cd6c6bf8e6 /Documentation/admin-guide | |
| parent | 200289db261f0c8131a5756133e9d30966289c3b (diff) | |
| parent | 1bf8012fc6997f2117f6919369cde16659db60e0 (diff) | |
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 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/ramoops.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/ramoops.rst b/Documentation/admin-guide/ramoops.rst index 6f534a707b2a..2eabef31220d 100644 --- a/Documentation/admin-guide/ramoops.rst +++ b/Documentation/admin-guide/ramoops.rst @@ -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() |