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

Commit 9fcfcdf3 authored by Dan Carpenter's avatar Dan Carpenter Committed by Arnaldo Carvalho de Melo
Browse files

perf jit: Remove some no-op error handling 



The 'info.e_machine' struct member is an uint16_t so 'm' is never less
than zero.  It looks like this was maybe left over code from earlier
versions so I've just removed it.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20160715210836.GB19522@mwanda


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e03141db

tools/perf/jvmti/jvmti_agent.c

+1 −6
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr) 
	ssize_t sret;

	char id[16];

	int fd, ret = -1;

	int m = -1;

	struct {

		uint16_t e_type;

		uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr) 
	if (sret != sizeof(info))

		goto error;



	m = info.e_machine;

	if (m < 0)

		m = 0; /* ELF EM_NONE */



	hdr->elf_mach = m;

	hdr->elf_mach = info.e_machine;

	ret = 0;

error:

	close(fd);