diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 17:30:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 17:30:50 +0900 |
| commit | 7f60ba388f5b9dd8b0da463b394412dace3ab814 (patch) | |
| tree | b97b4fb5c8ad07a435e5b1b559988364764d5e8d /Documentation | |
| parent | e665faa424a4a782aa986274920c1fc5b76f5560 (diff) | |
| parent | 80c9d03c22f13a17df67b4b99a83ed5e9acf6093 (diff) | |
| download | linux-7f60ba388f5b9dd8b0da463b394412dace3ab814.tar.gz | |
Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore
Pull pstore changes from Anton Vorontsov:
1) We no longer ad-hoc to the function tracer "high level"
infrastructure and no longer use its debugfs knobs. The change
slightly touches kernel/trace directory, but it got the needed ack
from Steven Rostedt:
http://lkml.org/lkml/2012/8/21/688
2) Added maintainers entry;
3) A bunch of fixes, nothing special.
* tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
pstore: Avoid recursive spinlocks in the oops_in_progress case
pstore/ftrace: Convert to its own enable/disable debugfs knob
pstore/ram: Add missing platform_device_unregister
MAINTAINERS: Add pstore maintainers
pstore/ram: Mark ramoops_pstore_write_buf() as notrace
pstore/ram: Fix printk format warning
pstore/ram: Fix possible NULL dereference
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ramoops.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt index 197ad59ab9bf..69b3cac4749d 100644 --- a/Documentation/ramoops.txt +++ b/Documentation/ramoops.txt @@ -102,9 +102,7 @@ related hangs. The functions call chain log is stored in a "ftrace-ramoops" file. Here is an example of usage: # mount -t debugfs debugfs /sys/kernel/debug/ - # cd /sys/kernel/debug/tracing - # echo function > current_tracer - # echo 1 > options/func_pstore + # echo 1 > /sys/kernel/debug/pstore/record_ftrace # reboot -f [...] # mount -t pstore pstore /mnt/ |