Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0353631a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Use __maybe_unused consistently 

Instead of defining __unused or redefining __maybe_unused.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-4eleto5pih31jw1q4dypm9pf@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3ee350fb

tools/perf/bench/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static inline uint32_t lfsr_32(uint32_t lfsr) 
 * kernel (KSM, zero page, etc.) cannot optimize away RAM

 * accesses:

 */

static inline u64 access_data(u64 *data __attribute__((unused)), u64 val)

static inline u64 access_data(u64 *data, u64 val)

{

	if (g->p.data_reads)

		val += *data;

tools/perf/jvmti/jvmti_agent.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <stdint.h>

#include <jvmti.h>



#define __unused __attribute__((unused))



#if defined(__cplusplus)

extern "C" {

#endif

tools/perf/jvmti/libjvmti.c

+3 −2
Original line number Diff line number Diff line 
#include <linux/compiler.h>

#include <sys/types.h>

#include <stdio.h>

#include <string.h>
@@ -238,7 +239,7 @@ code_generated_cb(jvmtiEnv *jvmti, 
}



JNIEXPORT jint JNICALL

Agent_OnLoad(JavaVM *jvm, char *options, void *reserved __unused)

Agent_OnLoad(JavaVM *jvm, char *options, void *reserved __maybe_unused)

{

	jvmtiEventCallbacks cb;

	jvmtiCapabilities caps1;
@@ -313,7 +314,7 @@ Agent_OnLoad(JavaVM *jvm, char *options, void *reserved __unused) 
}



JNIEXPORT void JNICALL

Agent_OnUnload(JavaVM *jvm __unused)

Agent_OnUnload(JavaVM *jvm __maybe_unused)

{

	int ret;

tools/perf/pmu-events/jevents.c

+0 −4
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ 
#include "json.h"

#include "jevents.h"



#ifndef __maybe_unused

#define __maybe_unused                  __attribute__((unused))

#endif



int verbose;

char *prog;

tools/perf/util/evsel.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <traceevent/event-parse.h>

#include <linux/hw_breakpoint.h>

#include <linux/perf_event.h>

#include <linux/compiler.h>

#include <linux/err.h>

#include <sys/ioctl.h>

#include <sys/resource.h>
@@ -1441,7 +1442,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, 
}



static int __open_attr__fprintf(FILE *fp, const char *name, const char *val,

				void *priv __attribute__((unused)))

				void *priv __maybe_unused)

{

	return fprintf(fp, "  %-32s %s\n", name, val);

}