Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: nmi_watchdog - documentation fix

nmi_watchdog is set to NMI_NONE by default (ie disabled) on _any_
mode so lets fix documentation too.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Cyrill Gorcunov and committed by
Ingo Molnar
afda335d 914bebfa

+7 -9
+7 -9
Documentation/nmi_watchdog.txt
··· 10 10 which get executed even if the system is otherwise locked up hard). 11 11 This can be used to debug hard kernel lockups. By executing periodic 12 12 NMI interrupts, the kernel can monitor whether any CPU has locked up, 13 - and print out debugging messages if so. 13 + and print out debugging messages if so. 14 14 15 15 In order to use the NMI watchdog, you need to have APIC support in your 16 16 kernel. For SMP kernels, APIC support gets compiled in automatically. For ··· 22 22 kernel debugging options, such as Kernel Stack Meter or Kernel Tracer, 23 23 may implicitly disable the NMI watchdog.] 24 24 25 - For x86-64, the needed APIC is always compiled in, and the NMI watchdog is 26 - always enabled with I/O-APIC mode (nmi_watchdog=1). 25 + For x86-64, the needed APIC is always compiled in. 27 26 28 27 Using local APIC (nmi_watchdog=2) needs the first performance register, so 29 28 you can't use it for other purposes (such as high precision performance ··· 62 63 "hlt", then you are out of luck -- the event will not happen at all and the 63 64 watchdog won't trigger. This is a shortcoming of the local APIC watchdog 64 65 -- unfortunately there is no "clock ticks" event that would work all the 65 - time. The I/O APIC watchdog is driven externally and has no such shortcoming. 66 + time. The I/O APIC watchdog is driven externally and has no such shortcoming. 66 67 But its NMI frequency is much higher, resulting in a more significant hit 67 68 to the overall system performance. 68 69 69 - NOTE: starting with 2.4.2-ac18 the NMI-oopser is disabled by default, 70 - you have to enable it with a boot time parameter. Prior to 2.4.2-ac18 71 - the NMI-oopser is enabled unconditionally on x86 SMP boxes. 70 + On x86 nmi_watchdog is disabled by default so you have to enable it with 71 + a boot time parameter. 72 72 73 - On x86-64 the NMI oopser is on by default. On 64bit Intel CPUs 74 - it uses IO-APIC by default and on AMD it uses local APIC. 73 + NOTE: Prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally 74 + on x86 SMP boxes. 75 75 76 76 [ feel free to send bug reports, suggestions and patches to 77 77 Ingo Molnar <mingo@redhat.com> or the Linux SMP mailing