Skip to content

Commit

Permalink
perf jit: Remove some no-op error handling
Browse files Browse the repository at this point in the history
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: Dan 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: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Dan Carpenter authored and Arnaldo Carvalho de Melo committed Jul 18, 2016
1 parent e03141d commit 9fcfcdf
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions tools/perf/jvmti/jvmti_agent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 9fcfcdf

Please sign in to comment.