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 <kris.van.hees@oracle.com>
Acked-by: Nick Alcock <nick.alcock@oracle.com>

diff --git a/dtrace/dtrace_isa.c b/dtrace/dtrace_isa.c
index 1b129519fe992b461cf493ae09a17758856c4eef..29b74e067eaab7e7bdff2db3b08daf1f3f3ea091 100644 (file)
--- 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;
                }