From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Wed, 8 Jul 2015 18:40:43 +0000 (-0400)
Subject: dtrace: fold NOPF into NOFAULT handling
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~68
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=92ac6717bff555bfbaf92340a05c6e1cf6bdb0b9;p=users%2Fjedix%2Flinux-maple.git

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 1b129519fe992..29b74e067eaab 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;
 		}