perf hists: Enlarge pid sort entry size

[deliverable/linux.git] / tools / perf / util / util.c

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index eab077ad6ca92f5fac2f570c3c96008203a980de..e08b9a092a239b17096ab2c23932898b1c249fe9 100644 (file)
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -33,7 +33,8 @@ struct callchain_param        callchain_param = {
 unsigned int page_size;
 int cacheline_size;
 
-unsigned int sysctl_perf_event_max_stack = PERF_MAX_STACK_DEPTH;
+int sysctl_perf_event_max_stack = PERF_MAX_STACK_DEPTH;
+int sysctl_perf_event_max_contexts_per_stack = PERF_MAX_CONTEXTS_PER_STACK;
 
 bool test_attr__enabled;
 
@@ -96,20 +97,17 @@ int rm_rf(char *path)
                scnprintf(namebuf, sizeof(namebuf), "%s/%s",
                          path, d->d_name);
 
-               ret = stat(namebuf, &statbuf);
+               /* We have to check symbolic link itself */
+               ret = lstat(namebuf, &statbuf);
                if (ret < 0) {
                        pr_debug("stat failed: %s\n", namebuf);
                        break;
                }
 
-               if (S_ISREG(statbuf.st_mode))
-                       ret = unlink(namebuf);
-               else if (S_ISDIR(statbuf.st_mode))
+               if (S_ISDIR(statbuf.st_mode))
                        ret = rm_rf(namebuf);
-               else {
-                       pr_debug("unknown file: %s\n", namebuf);
-                       ret = -1;
-               }
+               else
+                       ret = unlink(namebuf);
        }
        closedir(dir);