Commit d3bcd64b authored Dec 04, 2015 by Huang Rui Committed by Ingo Molnar Jan 06, 2016

perf/x86/rapl: Use unified perf_event_sysfs_show instead of special interface



Actually, rapl_sysfs_show is a duplicate of perf_event_sysfs_show. We
prefer to use the unified interface.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dasaratharaman Chandramouli<dasaratharaman.chandramouli@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <rric@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1449223661-2437-1-git-send-email-ray.huang@amd.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 673d188b

arch/x86/kernel/cpu/perf_event_intel_rapl.c

+5 −18

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ static struct kobj_attribute format_attr_##_var = \

		#define RAPL_EVENT_ATTR_STR(_name, v, str) \
		static struct perf_pmu_events_attr event_attr_##v = { \
		.attr = __ATTR(_name, 0444, rapl_sysfs_show, NULL), \
		.attr = __ATTR(_name, 0444, perf_event_sysfs_show, NULL), \
		.id = 0, \
		.event_str = str, \
		};
		@@ -405,19 +405,6 @@ static struct attribute_group rapl_pmu_attr_group = {
		.attrs = rapl_pmu_attrs,
		};

		static ssize_t rapl_sysfs_show(struct device *dev,
		struct device_attribute *attr,
		char *page)
		{
		struct perf_pmu_events_attr *pmu_attr = \
		container_of(attr, struct perf_pmu_events_attr, attr);

		if (pmu_attr->event_str)
		return sprintf(page, "%s", pmu_attr->event_str);

		return 0;
		}

		RAPL_EVENT_ATTR_STR(energy-cores, rapl_cores, "event=0x01");
		RAPL_EVENT_ATTR_STR(energy-pkg , rapl_pkg, "event=0x02");
		RAPL_EVENT_ATTR_STR(energy-ram , rapl_ram, "event=0x03");