summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi.c
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2015-07-15 19:29:36 +0200
committerIngo Molnar <mingo@kernel.org>2015-07-17 12:50:11 +0200
commit0b22930ebad563ae97ff3f8d7b9f12060b4c6e6b (patch)
tree6d7cb96afdf0be056bddb15964bf5b2c0ec4a1a3 /arch/x86/kernel/nmi.c
parentx86/nmi/64: Switch stacks on userspace NMI entry (diff)
downloadlinux-0b22930ebad563ae97ff3f8d7b9f12060b4c6e6b.tar.xz
linux-0b22930ebad563ae97ff3f8d7b9f12060b4c6e6b.zip
x86/nmi/64: Improve nested NMI comments
I found the nested NMI documentation to be difficult to follow. Improve the comments. Signed-off-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Steven Rostedt <rostedt@goodmis.org> Cc: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
-rw-r--r--arch/x86/kernel/nmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index d8766b1c9974..d05bd2e2ee91 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -408,8 +408,8 @@ static void default_do_nmi(struct pt_regs *regs)
NOKPROBE_SYMBOL(default_do_nmi);
/*
- * NMIs can hit breakpoints which will cause it to lose its NMI context
- * with the CPU when the breakpoint or page fault does an IRET.
+ * NMIs can page fault or hit breakpoints which will cause it to lose
+ * its NMI context with the CPU when the breakpoint or page fault does an IRET.
*
* As a result, NMIs can nest if NMIs get unmasked due an IRET during
* NMI processing. On x86_64, the asm glue protects us from nested NMIs