dtrace: update spec file for 0.6.0-4

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>

diff --git a/dtrace/dtrace-module.spec b/dtrace/dtrace-module.spec
index 24280b33baa9f745d662039bd2c082648a1bd7e6..573f04e59d691cecab26d35c4d5959f948463f6c 100644 (file)
--- a/dtrace/dtrace-module.spec
+++ b/dtrace/dtrace-module.spec
@@ -127,6 +127,9 @@ rm -rf %{buildroot}
 /usr/include/linux/dtrace/types.h
 
 %changelog
+* Wed Apr 12 2017 - <kris.van.hees@oracle.com> - 0.6.0-4
+- Always inline dtrace_dif_variable to ensure consistent aframes count
+  [Orabug: 25872472]
 * Sun Apr  2 2017 - <kris.van.hees@oracle.com> - 0.6.0-3
 - Lockfree walltimestamp implementation (Tomas Jedlicka) [Orabug: 25715256]
 - Corrected aframes values to skip DTrace frames [Orabug: 25727046]

diff --git a/dtrace/dtrace_dif.c b/dtrace/dtrace_dif.c
index f3cc294d696f4968b538fce66353411873cbe8b7..b31ec8e097f07f76c2bcdb42936f99ccbe32356f 100644 (file)
--- a/dtrace/dtrace_dif.c
+++ b/dtrace/dtrace_dif.c
@@ -2016,7 +2016,7 @@ static uintptr_t dtrace_dif_varstr(uintptr_t addr, dtrace_state_t *state,
  *
  * This function is annotated to be always inlined in dtrace_dif_emulate()
  * because (1) that is the only place where it is called from, and (2) it has
- * come to our attention that some GCC versions inline i automatically while
+ * come to our attention that some GCC versions inline it automatically while
  * others do not and that messes up the number of frames to skip (aframes).
  */
 static uint64_t __always_inline dtrace_dif_variable(dtrace_mstate_t *mstate,