Ingo, This is the version 2 with the updates suggested by H. Peter Anvin. Please pull the latest tip/x86/core-2 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git tip/x86/core-2 Head SHA1: 70fb74a5420f9caa3e001d65004e4b669124283e Steven Rostedt (3): x86: Save cr2 in NMI in case NMIs take a page fault x86: Remove cmpxchg from i386 NMI nesting code x86: Save cr2 in NMI in case NMIs take a page fault (for i386) ---- arch/x86/kernel/entry_64.S | 20 +++++++++++++++++++ arch/x86/kernel/nmi.c | 47 +++++++++++++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 14 deletions(-)