Merge branch 'core/urgent' into core/locking

It's not really a regression fix, so move it to the v3.15 queue.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2014-02-27 13:06:55 +01:00
Родитель f207dbe63c 70e0ac5f36
Коммит d2ae2e525e
1 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -320,10 +320,11 @@ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
==============================================================
hung_task_warning:
hung_task_warnings:
The maximum number of warnings to report. During a check interval
When this value is reached, no more the warnings will be reported.
if a hung task is detected, this value is decreased by 1.
When this value reaches 0, no more warnings will be reported.
This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
-1: report an infinite number of warnings.