X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Documentation%2Fnmi_watchdog.txt;h=6cad46e8ac2d4006d66811c8b987599ee23516b0;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=c1ba4e6f1ac8d56111e6bb72290a019bc594363e;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index c1ba4e6f1..6cad46e8a 100644
--- a/Documentation/nmi_watchdog.txt
+++ b/Documentation/nmi_watchdog.txt
@@ -58,6 +58,9 @@ NOTE: starting with 2.4.2-ac18 the NMI-oopser is disabled by default,
 you have to enable it with a boot time parameter.  Prior to 2.4.2-ac18
 the NMI-oopser is enabled unconditionally on x86 SMP boxes.
 
+On x86-64 the NMI oopser is on by default. On 64bit Intel CPUs
+it uses IO-APIC by default and on AMD it uses local APIC.
+
 [ feel free to send bug reports, suggestions and patches to
   Ingo Molnar <mingo@redhat.com> or the Linux SMP mailing
   list at <linux-smp@vger.kernel.org> ]