94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
From a2f4119dfb729ac6bcf8a74d555ba42f16861e7f Mon Sep 17 00:00:00 2001
|
|
From: Kajol Jain <kjain@linux.ibm.com>
|
|
Date: Mon, 7 Sep 2020 12:11:29 +0530
|
|
Subject: [PATCH 128/201] perf jevents: Make json_events() static and ditch
|
|
jevents.h file
|
|
|
|
mainline inclusion
|
|
from mainline-v5.10-rc1
|
|
commit 0d52b7889be17076e0c9c535d74db9c4c8b506ce
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d52b7889be17076e0c9c535d74db9c4c8b506ce
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
This patch removes jevents.h and makes json_events function static.
|
|
|
|
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Reviewed-by: John Garry <john.garry@huawei.com>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Jin Yao <yao.jin@linux.intel.com>
|
|
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
|
|
Link: http://lore.kernel.org/lkml/20200907064133.75090-2-kjain@linux.ibm.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/pmu-events/jevents.c | 3 +--
|
|
tools/perf/pmu-events/jevents.h | 23 -----------------------
|
|
2 files changed, 1 insertion(+), 25 deletions(-)
|
|
delete mode 100644 tools/perf/pmu-events/jevents.h
|
|
|
|
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
|
|
index 1f7d4c53631d..e1423f0fbb0f 100644
|
|
--- a/tools/perf/pmu-events/jevents.c
|
|
+++ b/tools/perf/pmu-events/jevents.c
|
|
@@ -48,7 +48,6 @@
|
|
#include <linux/list.h>
|
|
#include "jsmn.h"
|
|
#include "json.h"
|
|
-#include "jevents.h"
|
|
|
|
int verbose;
|
|
char *prog;
|
|
@@ -513,7 +512,7 @@ try_fixup(const char *fn, char *arch_std, char **event, char **desc,
|
|
}
|
|
|
|
/* Call func with each event in the json file */
|
|
-int json_events(const char *fn,
|
|
+static int json_events(const char *fn,
|
|
int (*func)(void *data, char *name, char *event, char *desc,
|
|
char *long_desc,
|
|
char *pmu, char *unit, char *perpkg,
|
|
diff --git a/tools/perf/pmu-events/jevents.h b/tools/perf/pmu-events/jevents.h
|
|
deleted file mode 100644
|
|
index 2afc8304529e..000000000000
|
|
--- a/tools/perf/pmu-events/jevents.h
|
|
+++ /dev/null
|
|
@@ -1,23 +0,0 @@
|
|
-/* SPDX-License-Identifier: GPL-2.0 */
|
|
-#ifndef JEVENTS_H
|
|
-#define JEVENTS_H 1
|
|
-
|
|
-int json_events(const char *fn,
|
|
- int (*func)(void *data, char *name, char *event, char *desc,
|
|
- char *long_desc,
|
|
- char *pmu,
|
|
- char *unit, char *perpkg, char *metric_expr,
|
|
- char *metric_name, char *metric_group,
|
|
- char *deprecated, char *metric_constraint),
|
|
- void *data);
|
|
-char *get_cpu_str(void);
|
|
-
|
|
-#ifndef min
|
|
-#define min(x, y) ({ \
|
|
- typeof(x) _min1 = (x); \
|
|
- typeof(y) _min2 = (y); \
|
|
- (void) (&_min1 == &_min2); \
|
|
- _min1 < _min2 ? _min1 : _min2; })
|
|
-#endif
|
|
-
|
|
-#endif
|
|
--
|
|
2.27.0
|
|
|