summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-07-16 00:08:36 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-07-18 12:20:00 -0300
commit9fcfcdf3c7b613c0d9536f57587456411b8a4e33 (patch)
treeaa1078bb9d7ac05cc237aa9bab4b3177cbb35978 /tools
parente03141db361399619f9ee97e00d4c6fe2b472104 (diff)
downloadlinux-9fcfcdf3c7b613c0d9536f57587456411b8a4e33.tar.gz
linux-9fcfcdf3c7b613c0d9536f57587456411b8a4e33.tar.bz2
linux-9fcfcdf3c7b613c0d9536f57587456411b8a4e33.zip
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: 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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/jvmti/jvmti_agent.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 91bf333a366a..55daefff0d54 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -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);