From 2ebe08cf58782f5129615c1d687ab89abca31567 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 23 Mar 2008 21:06:30 +0100
Subject: [PATCH] --- yaml --- r: 87871 b: refs/heads/master c:
 5abbcf29928966b28d70f8a0da424f55582f8603 h: refs/heads/master i:   87869:
 8e8ae33d93d561da1e4a80a4bff4fa473ce1816e   87867:
 7856bcc977ad81630db56fd11d78175d7b25f408   87863:
 5d030a2e812e365e952382f59c6797cf75f66acf   87855:
 6337af3401317f4421066aebb770337f285d777d   87839:
 8b8a060e8c4e98ef0d32dda7f2376736e036f470   87807:
 35307a3dbd22aa815cc9d3cbcb21da4ccccee7fe v: v3

---
 [refs]                               | 2 +-
 trunk/Documentation/nmi_watchdog.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e79ce712bff..63ead5b8186e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25e59881f109dc6378ebc463ae4c2de907435de3
+refs/heads/master: 5abbcf29928966b28d70f8a0da424f55582f8603
diff --git a/trunk/Documentation/nmi_watchdog.txt b/trunk/Documentation/nmi_watchdog.txt
index c025a4561c10..757c729ee42e 100644
--- a/trunk/Documentation/nmi_watchdog.txt
+++ b/trunk/Documentation/nmi_watchdog.txt
@@ -23,8 +23,7 @@ kernel debugging options, such as Kernel Stack Meter or Kernel Tracer,
 may implicitly disable the NMI watchdog.]
 
 For x86-64, the needed APIC is always compiled in, and the NMI watchdog is
-always enabled with I/O-APIC mode (nmi_watchdog=1). Currently, local APIC
-mode (nmi_watchdog=2) does not work on x86-64.
+always enabled with I/O-APIC mode (nmi_watchdog=1).
 
 Using local APIC (nmi_watchdog=2) needs the first performance register, so
 you can't use it for other purposes (such as high precision performance