From: Andi Kleen <ak@suse.de>

Sync nmi_watchdog.txt with reality on x86-64.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/Documentation/nmi_watchdog.txt |    3 +++
 1 files changed, 3 insertions(+)

diff -puN Documentation/nmi_watchdog.txt~documentation-fix-for-nmi-watchdog Documentation/nmi_watchdog.txt
--- 25/Documentation/nmi_watchdog.txt~documentation-fix-for-nmi-watchdog	2004-07-31 16:56:12.786570240 -0700
+++ 25-akpm/Documentation/nmi_watchdog.txt	2004-07-31 16:56:12.790569632 -0700
@@ -58,6 +58,9 @@ NOTE: starting with 2.4.2-ac18 the NMI-o
 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> ]
_