projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'entropy'
[linux-2.6-microblaze.git]
/
tools
/
perf
/
builtin-annotate.c
diff --git
a/tools/perf/builtin-annotate.c
b/tools/perf/builtin-annotate.c
index
4e4d2e7
..
8db8fc9
100644
(file)
--- a/
tools/perf/builtin-annotate.c
+++ b/
tools/perf/builtin-annotate.c
@@
-27,6
+27,7
@@
#include "util/sort.h"
#include "util/hist.h"
#include "util/dso.h"
#include "util/sort.h"
#include "util/hist.h"
#include "util/dso.h"
+#include "util/machine.h"
#include "util/map.h"
#include "util/session.h"
#include "util/tool.h"
#include "util/map.h"
#include "util/session.h"
#include "util/tool.h"
@@
-39,6
+40,7
@@
#include <dlfcn.h>
#include <errno.h>
#include <linux/bitmap.h>
#include <dlfcn.h>
#include <errno.h>
#include <linux/bitmap.h>
+#include <linux/err.h>
struct perf_annotate {
struct perf_tool tool;
struct perf_annotate {
struct perf_tool tool;
@@
-583,8
+585,8
@@
int cmd_annotate(int argc, const char **argv)
data.path = input_name;
annotate.session = perf_session__new(&data, false, &annotate.tool);
data.path = input_name;
annotate.session = perf_session__new(&data, false, &annotate.tool);
- if (
annotate.session == NULL
)
- return
-1
;
+ if (
IS_ERR(annotate.session)
)
+ return
PTR_ERR(annotate.session)
;
annotate.has_br_stack = perf_header__has_feat(&annotate.session->header,
HEADER_BRANCH_STACK);
annotate.has_br_stack = perf_header__has_feat(&annotate.session->header,
HEADER_BRANCH_STACK);