[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200827130958.189146-2-kjain@linux.ibm.com>
Date: Thu, 27 Aug 2020 18:39:54 +0530
From: Kajol Jain <kjain@...ux.ibm.com>
To: acme@...nel.org
Cc: peterz@...radead.org, mingo@...hat.com, mark.rutland@....com,
alexander.shishkin@...ux.intel.com, pc@...ibm.com,
jolsa@...hat.com, namhyung@...nel.org, ak@...ux.intel.com,
yao.jin@...ux.intel.com, linux-kernel@...r.kernel.org,
linux-perf-users@...r.kernel.org, irogers@...gle.com,
maddy@...ux.ibm.com, ravi.bangoria@...ux.ibm.com,
john.garry@...wei.com, kjain@...ux.ibm.com
Subject: [PATCH v6 1/5] perf/jevents: Remove jevents.h file
This patch removes jevents.h file and add its data inside
jevents.c as this file is only included there.
Signed-off-by: Kajol Jain <kjain@...ux.ibm.com>
---
tools/perf/pmu-events/jevents.c | 9 ++++++++-
tools/perf/pmu-events/jevents.h | 23 -----------------------
2 files changed, 8 insertions(+), 24 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 fa86c5f997cc..1c55cc754b5a 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -48,11 +48,18 @@
#include <linux/list.h>
#include "jsmn.h"
#include "json.h"
-#include "jevents.h"
int verbose;
char *prog;
+#ifndef min
+#define min(x, y) ({ \
+ typeof(x) _min1 = (x); \
+ typeof(y) _min2 = (y); \
+ (void)(&_min1 == &_min2); \
+ _min1 < _min2 ? _min1 : _min2; })
+#endif
+
int eprintf(int level, int var, const char *fmt, ...)
{
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.26.2
Powered by blists - more mailing lists