Hi all,
Today's linux-next merge of the tip tree got a conflict in
Documentation/sysctl/kernel.txt between commit 7984754b99b6 ("kexec: add
sysctl to disable kexec_load") from Linus' tree and commit 270750dbc18a
("hung_task: Display every hung task warning") from the tip tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc Documentation/sysctl/kernel.txt index ee9a2f983b99,4205f3c05cbe..000000000000 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@@ -33,7 -33,10 +33,11 @@@ show up in /proc/sys/kernel - domainname - hostname - hotplug + - hung_task_panic + - hung_task_check_count + - hung_task_timeout_secs + - hung_task_warnings +- kexec_load_disabled - kptr_restrict - kstack_depth_to_print [ X86 only ] - l2cr [ PPC only ] @@@ -288,18 -291,44 +292,56 @@@ Default value is "/sbin/hotplug" ============================================================== + hung_task_panic: + + Controls the kernel's behavior when a hung task is detected. + This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. + + 0: continue operation. This is the default behavior. + + 1: panic immediately. + + ============================================================== + + hung_task_check_count: + + The upper bound on the number of tasks that are checked. + This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. + + ============================================================== + + hung_task_timeout_secs: + + Check interval. When a task in D state did not get scheduled + for more than this value report a warning. + This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. + + 0: means infinite timeout - no checking done. + + ============================================================== + + hung_task_warning: + + The maximum number of warnings to report. During a check interval + When this value is reached, no more the warnings will be reported. + This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. + + -1: report an infinite number of warnings. + + ============================================================== + +kexec_load_disabled: + +A toggle indicating if the kexec_load syscall has been disabled. This +value defaults to 0 (false: kexec_load enabled), but can be set to 1 +(true: kexec_load disabled). Once true, kexec can no longer be used, and +the toggle cannot be set back to false. This allows a kexec image to be +loaded before disabling the syscall, allowing a system to set up (and +later use) an image without it being altered. Generally used together +with the "modules_disabled" sysctl. + +============================================================== + kptr_restrict: This toggle indicates whether restrictions are placed on
pgpsLU2owuYpv.pgp
Description: PGP signature
