diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 13:40:51 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 13:40:51 -1000 |
| commit | a2d773023552f68baa2db2226dfd6d761c0df5da (patch) | |
| tree | c905702c4f318d0e569222187472289c574bde3c /Documentation | |
| parent | 72f9adfd20e3be8a33ff3ef96cec787ed97b9ba9 (diff) | |
| parent | 7644c16c7e7431fa398e834109dbb76dc1b51617 (diff) | |
| download | linux-stable-a2d773023552f68baa2db2226dfd6d761c0df5da.tar.gz linux-stable-a2d773023552f68baa2db2226dfd6d761c0df5da.tar.bz2 linux-stable-a2d773023552f68baa2db2226dfd6d761c0df5da.zip | |
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
efivars: Introduce PSTORE_EFI_ATTRIBUTES
efivars: Use string functions in pstore_write
efivars: introduce utf16_strncmp
efivars: String functions
efi: Add support for using efivars as a pstore backend
pstore: Allow the user to explicitly choose a backend
pstore: Make "part" unsigned
pstore: Add extra context for writes and erases
pstore: Extend API for more flexibility in new backends
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/pstore | 6 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/pstore b/Documentation/ABI/testing/pstore index ddf451ee2a08..ff1df4e3b059 100644 --- a/Documentation/ABI/testing/pstore +++ b/Documentation/ABI/testing/pstore @@ -39,3 +39,9 @@ Description: Generic interface to platform dependent persistent storage. multiple) files based on the record size of the underlying persistent storage until at least this amount is reached. Default is 10 Kbytes. + + Pstore only supports one backend at a time. If multiple + backends are available, the preferred backend may be + set by passing the pstore.backend= argument to the kernel at + boot time. + diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4ca93898fbd3..26a83743af19 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2153,6 +2153,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. [HW,MOUSE] Controls Logitech smartscroll autorepeat. 0 = disabled, 1 = enabled (default). + pstore.backend= Specify the name of the pstore backend to use + pt. [PARIDE] See Documentation/blockdev/paride.txt. |