summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2008-03-23 21:06:30 +0100
committerIngo Molnar <mingo@elte.hu>2008-03-27 16:08:45 +0100
commit5abbcf29928966b28d70f8a0da424f55582f8603 (patch)
tree9fe5665a315f80f8848b5688a2df0ba46f62aee9
parent25e59881f109dc6378ebc463ae4c2de907435de3 (diff)
downloadlinux-5abbcf29928966b28d70f8a0da424f55582f8603.tar.gz
linux-5abbcf29928966b28d70f8a0da424f55582f8603.tar.bz2
linux-5abbcf29928966b28d70f8a0da424f55582f8603.zip
x86, documentation: nmi_watchdog=2 works on x86_64
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--Documentation/nmi_watchdog.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index c025a4561c10..757c729ee42e 100644
--- a/Documentation/nmi_watchdog.txt
+++ b/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