diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 21:34:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 21:34:13 -0400 |
| commit | d7b6de14a0ef8a376f9d57b867545b47302b7bfb (patch) | |
| tree | 46904d68a5a68f22e6c6baf3472edd4c37a39481 /Documentation | |
| parent | 30d38542ec777468bb6a31829076a2dbc5690e35 (diff) | |
| parent | 4dca10a96041f78bed11ce9e4a5cfde813ec4ccb (diff) | |
Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: fix invalid proc_handler for softlockup_panic
softlockup: fix watchdog task wakeup frequency
softlockup: fix watchdog task wakeup frequency
softlockup: show irqtrace
softlockup: print a module list on being stuck
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
softlockup: fix softlockup_thresh fix
softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
softlockup: allow panic on lockup
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 30d44b78171a..47e7d8794fc6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -2034,6 +2034,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 2034 | 2034 | ||
| 2035 | snd-ymfpci= [HW,ALSA] | 2035 | snd-ymfpci= [HW,ALSA] |
| 2036 | 2036 | ||
| 2037 | softlockup_panic= | ||
| 2038 | [KNL] Should the soft-lockup detector generate panics. | ||
| 2039 | |||
| 2037 | sonypi.*= [HW] Sony Programmable I/O Control Device driver | 2040 | sonypi.*= [HW] Sony Programmable I/O Control Device driver |
| 2038 | See Documentation/sonypi.txt | 2041 | See Documentation/sonypi.txt |
| 2039 | 2042 | ||