Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ad0f91 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 * Fix build of 'trace' in some systems due to using some architecture-specific
   signal numbers (Ben Hutchings)

 * Stop resolving when finding a map in in ip__resolve_ams, this way at least
   the DSO will be resolved when a symbol isn't (Don Zickus)

 * Fix crash in elf_section_by_name when not checking if some section string index
   is valid (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8712a005 fdf57dd0

tools/perf/builtin-trace.c

+9 −1
Original line number Diff line number Diff line
@@ -825,7 +825,6 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal 
	P_SIGNUM(PIPE);

	P_SIGNUM(ALRM);

	P_SIGNUM(TERM);

	P_SIGNUM(STKFLT);

	P_SIGNUM(CHLD);

	P_SIGNUM(CONT);

	P_SIGNUM(STOP);
@@ -841,6 +840,15 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal 
	P_SIGNUM(IO);

	P_SIGNUM(PWR);

	P_SIGNUM(SYS);

#ifdef SIGEMT

	P_SIGNUM(EMT);

#endif

#ifdef SIGSTKFLT

	P_SIGNUM(STKFLT);

#endif

#ifdef SIGSWI

	P_SIGNUM(SWI);

#endif

	default: break;

	}

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread, 
		 */

		thread__find_addr_location(thread, machine, m, MAP__FUNCTION,

				ip, &al);

		if (al.sym)

		if (al.map)

			goto found;

	}

found:

tools/perf/util/symbol-elf.c

+3 −3
Original line number Diff line number Diff line
@@ -151,15 +151,15 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep, 


		gelf_getshdr(sec, shp);

		str = elf_strptr(elf, ep->e_shstrndx, shp->sh_name);

		if (!strcmp(name, str)) {

		if (str && !strcmp(name, str)) {

			if (idx)

				*idx = cnt;

			break;

			return sec;

		}

		++cnt;

	}



	return sec;

	return NULL;

}



#define elf_section__for_each_rel(reldata, pos, pos_mem, idx, nr_entries) \