summaryrefslogtreecommitdiff
path: root/tools/perf/util
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-27 11:44:34 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-27 11:44:34 +0400
commit167f829752f9cef51f59cc500abc0ad6ba69f5cb (patch)
treed3ec172cdd864c748bea2c014943fc13873fefc0 /tools/perf/util
parente04d6c53a58cee3380adaa66fe2eeffbd82d213c (diff)
parent45b146d746ea1b7f87b023a79d5186d0e87793eb (diff)
downloadlinux-167f829752f9cef51f59cc500abc0ad6ba69f5cb.tar.xz
Merge branch 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index 9fea75535221..96bee5c46008 100644
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -13,7 +13,7 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen)
{
FILE *fp;
char mountpoint[MAX_PATH+1], tokens[MAX_PATH+1], type[MAX_PATH+1];
- char *token, *saved_ptr;
+ char *token, *saved_ptr = NULL;
int found = 0;
fp = fopen("/proc/mounts", "r");