From: Steven Rostedt (VMware) Date: Wed, 9 Oct 2019 15:05:38 +0000 (-0400) Subject: recordmcount: Fix nop_mcount() function X-Git-Tag: v5.15~5309^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f8557b88d6aa5bf31f25f6013d81355a1b1d48d;p=platform%2Fkernel%2Flinux-starfive.git recordmcount: Fix nop_mcount() function The removal of the longjmp code in recordmcount.c mistakenly made the return of make_nop() being negative an exit of nop_mcount(). It should not exit the routine, but instead just not process that part of the code. By exiting with an error code, it would cause the update of recordmcount to fail some files which would fail the build if ftrace function tracing was enabled. Link: http://lkml.kernel.org/r/20191009110538.5909fec6@gandalf.local.home Reported-by: Uwe Kleine-König Tested-by: Uwe Kleine-König Fixes: 3f1df12019f3 ("recordmcount: Rewrite error/success handling") Signed-off-by: Steven Rostedt (VMware) --- diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index 8f0a278..74eab03 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -389,11 +389,8 @@ static int nop_mcount(Elf_Shdr const *const relhdr, mcountsym = get_mcountsym(sym0, relp, str0); if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { - if (make_nop) { + if (make_nop) ret = make_nop((void *)ehdr, _w(shdr->sh_offset) + _w(relp->r_offset)); - if (ret < 0) - return -1; - } if (warn_on_notrace_sect && !once) { printf("Section %s has mcount callers being ignored\n", txtname);