From a7de10c09aaa80fc87647d47c2193bd6816313cc Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Wed, 12 Apr 2017 07:42:07 -0400 Subject: [PATCH] dtrace: update spec file for 0.6.0-4 Signed-off-by: Kris Van Hees --- dtrace/dtrace-module.spec | 3 +++ dtrace/dtrace_dif.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dtrace/dtrace-module.spec b/dtrace/dtrace-module.spec index 24280b33baa9..573f04e59d69 100644 --- 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 - - 0.6.0-4 +- Always inline dtrace_dif_variable to ensure consistent aframes count + [Orabug: 25872472] * Sun Apr 2 2017 - - 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 f3cc294d696f..b31ec8e097f0 100644 --- 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, -- 2.50.1