diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 13:20:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 13:20:47 -0700 |
| commit | fb8c7fb25d7d754a992481e9f763ec0b5889c4d9 (patch) | |
| tree | d43cd30836988e263ddeecd54a6c74e9ac03aad2 /Documentation/nmi_watchdog.txt | |
| parent | 074fcab574a36edec35d2e74955250f2e17d6000 (diff) | |
| parent | 2e8fe719b57bbdc9e313daed1204bb55fed3ed44 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
xen: fix UP setup of shared_info
xen: fix RMW when unmasking events
x86, documentation: nmi_watchdog=2 works on x86_64
x86: stricter check in follow_huge_addr()
rdc321x: GPIO routines bugfixes
x86: ptrace.c: fix defined-but-unused warnings
x86: fix prefetch workaround
Diffstat (limited to 'Documentation/nmi_watchdog.txt')
| -rw-r--r-- | Documentation/nmi_watchdog.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt index c025a4561c1..757c729ee42 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 |