Commit 076e35d3 authored by openeuler-sync-bot's avatar openeuler-sync-bot
Browse files

Merge remote-tracking branch 'upstream/openEuler-22.03-LTS-SP1' into HEAD

parents 955649d9 3961a62b

arch/powerpc/perf/imc-pmu.c

+6 −0
Original line number Diff line number Diff line
@@ -291,6 +291,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 
	attr_group->attrs = attrs;

	do {

		ev_val_str = kasprintf(GFP_KERNEL, "event=0x%x", pmu->events[i].value);

		if (!ev_val_str)

			continue;

		dev_str = device_str_attr_create(pmu->events[i].name, ev_val_str);

		if (!dev_str)

			continue;
@@ -298,6 +300,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 
		attrs[j++] = dev_str;

		if (pmu->events[i].scale) {

			ev_scale_str = kasprintf(GFP_KERNEL, "%s.scale", pmu->events[i].name);

			if (!ev_scale_str)

				continue;

			dev_str = device_str_attr_create(ev_scale_str, pmu->events[i].scale);

			if (!dev_str)

				continue;
@@ -307,6 +311,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 


		if (pmu->events[i].unit) {

			ev_unit_str = kasprintf(GFP_KERNEL, "%s.unit", pmu->events[i].name);

			if (!ev_unit_str)

				continue;

			dev_str = device_str_attr_create(ev_unit_str, pmu->events[i].unit);

			if (!dev_str)

				continue;