diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:55:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:56:13 +0200 |
| commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
| tree | c381fcfcfeb38515bfa93445c80ad9231343414d /Documentation/sysrq.txt | |
| parent | 240ebbf81f149b11a31e060ebe5ee51a3c775360 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/sysrq.txt')
| -rw-r--r-- | Documentation/sysrq.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index cf42b820ff9d..d56a01775423 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -66,7 +66,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'b' - Will immediately reboot the system without syncing or unmounting your disks. -'c' - Will perform a kexec reboot in order to take a crashdump. +'c' - Will perform a system crash by a NULL pointer dereference. + A crashdump will be taken if configured. 'd' - Shows all locks that are held. @@ -141,8 +142,8 @@ useful when you want to exit a program that will not let you switch consoles. re'B'oot is good when you're unable to shut down. But you should also 'S'ync and 'U'mount first. -'C'rashdump can be used to manually trigger a crashdump when the system is hung. -The kernel needs to have been built with CONFIG_KEXEC enabled. +'C'rash can be used to manually trigger a crashdump when the system is hung. +Note that this just triggers a crash if there is no dump mechanism available. 'S'ync is great when your system is locked up, it allows you to sync your disks and will certainly lessen the chance of data loss and fscking. Note |