diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 23:52:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 23:52:52 -0400 |
| commit | a02040d8d5d533773f98e02e1a8e56db5fa7a363 (patch) | |
| tree | 5b490abce2688f80a9732346cf08127bbb48a3e3 /Documentation/devicetree | |
| parent | 0603006b450004213eeed22d4fbcc103c994c2e6 (diff) | |
| parent | e976e56423dc1cc01686861fc3e0c6c0ec8cd8b7 (diff) | |
Merge tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fixes from Kees Cook:
"Fixes for pstore ramoops driver to catch bad kfree() and to use better
DT bindings"
* tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
ramoops: use persistent_ram_free() instead of kfree() for freeing prz
ramoops: use DT reserved-memory bindings
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/reserved-memory/ramoops.txt (renamed from Documentation/devicetree/bindings/misc/ramoops.txt) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/misc/ramoops.txt b/Documentation/devicetree/bindings/reserved-memory/ramoops.txt index cd02cec67d38..e81f821a2135 100644 --- a/Documentation/devicetree/bindings/misc/ramoops.txt +++ b/Documentation/devicetree/bindings/reserved-memory/ramoops.txt @@ -2,8 +2,9 @@ Ramoops oops/panic logger ========================= ramoops provides persistent RAM storage for oops and panics, so they can be -recovered after a reboot. It is a backend to pstore, so this node is named -"ramoops" after the backend, rather than "pstore" which is the subsystem. +recovered after a reboot. This is a child-node of "/reserved-memory", and +is named "ramoops" after the backend, rather than "pstore" which is the +subsystem. Parts of this storage may be set aside for other persistent log buffers, such as kernel log messages, or for optional ECC error-correction data. The total @@ -21,8 +22,7 @@ Required properties: - compatible: must be "ramoops" -- memory-region: phandle to a region of memory that is preserved between - reboots +- reg: region of memory that is preserved between reboots Optional properties: |