From 92ac6717bff555bfbaf92340a05c6e1cf6bdb0b9 Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Wed, 8 Jul 2015 14:40:43 -0400 Subject: [PATCH] dtrace: fold NOPF into NOFAULT handling Rather than ignoring page faults only in specific cases when memory access occurs in DTrace, do so always when NOFAULT processing is requested. Signed-off-by: Kris Van Hees Acked-by: Nick Alcock --- dtrace/dtrace_isa.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dtrace/dtrace_isa.c b/dtrace/dtrace_isa.c index 1b129519fe99..29b74e067eaa 100644 --- a/dtrace/dtrace_isa.c +++ b/dtrace/dtrace_isa.c @@ -225,15 +225,12 @@ unsigned long dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, break; } - DTRACE_CPUFLAG_SET(CPU_DTRACE_NOPF); DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); get_user(addr, sp); DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); - DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOPF); if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_FAULT)) { DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_BADADDR); - DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_PF_TRAPPED); break; } -- 2.50.1