diff options
Diffstat (limited to 'debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch')
| -rw-r--r-- | debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch b/debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch index f6deb46bf..bd1bcd490 100644 --- a/debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch +++ b/debian/patches/bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch @@ -19,7 +19,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c -@@ -50,6 +50,18 @@ +@@ -51,6 +51,18 @@ #include "json.h" #include "pmu-events.h" @@ -38,13 +38,14 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> int verbose; char *prog; -@@ -971,6 +983,78 @@ static int get_maxfds(void) +@@ -981,6 +993,79 @@ static int get_maxfds(void) */ static FILE *eventsfp; static char *mapfile; +static struct ordered_ftw_state *ordered_ftw_state; + -+static int ordered_ftw_add(const char *fpath, const struct stat *sb, ++static int ordered_ftw_add(const char *fpath, ++ const struct stat *sb __maybe_unused, + int typeflag, struct FTW *ftwbuf) +{ + struct ordered_ftw_state *state = ordered_ftw_state; @@ -117,7 +118,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> static int is_leaf_dir(const char *fpath) { -@@ -1023,19 +1107,19 @@ static int is_json_file(const char *name +@@ -1033,19 +1118,19 @@ static int is_json_file(const char *name return 0; } @@ -140,7 +141,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> int typeflag, struct FTW *ftwbuf) { char *tblname, *bname; -@@ -1065,9 +1149,9 @@ static int process_one_file(const char * +@@ -1075,9 +1160,9 @@ static int process_one_file(const char * } else bname = (char *) fpath + ftwbuf->base; @@ -152,7 +153,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> /* base dir or too deep */ if (level == 0 || level > 4) -@@ -1241,21 +1325,21 @@ int main(int argc, char *argv[]) +@@ -1251,21 +1336,21 @@ int main(int argc, char *argv[]) */ maxfds = get_maxfds(); |