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 tag 'rproc-v5.3' of git://github.com/andersson/remoteproc
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
pmu.c
diff --git
a/tools/perf/util/pmu.c
b/tools/perf/util/pmu.c
index
55f4de6
..
f32b710
100644
(file)
--- a/
tools/perf/util/pmu.c
+++ b/
tools/perf/util/pmu.c
@@
-2,6
+2,7
@@
#include <linux/list.h>
#include <linux/compiler.h>
#include <linux/string.h>
#include <linux/list.h>
#include <linux/compiler.h>
#include <linux/string.h>
+#include <linux/zalloc.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
@@
-14,7
+15,6
@@
#include <api/fs/fs.h>
#include <locale.h>
#include <regex.h>
#include <api/fs/fs.h>
#include <locale.h>
#include <regex.h>
-#include "util.h"
#include "pmu.h"
#include "parse-events.h"
#include "cpumap.h"
#include "pmu.h"
#include "parse-events.h"
#include "cpumap.h"
@@
-1245,7
+1245,7
@@
int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
info->metric_expr = alias->metric_expr;
info->metric_name = alias->metric_name;
info->metric_expr = alias->metric_expr;
info->metric_name = alias->metric_name;
- list_del(&term->list);
+ list_del
_init
(&term->list);
free(term);
}
free(term);
}