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

Commit bea95c15 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/hw-branch-sampling' into perf/core 



Merge reason: The 'perf record -b' hardware branch sampling feature is ready for upstream.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents f9b4eeb8 24bff2dc

arch/alpha/kernel/perf_event.c

+4 −0
Original line number Diff line number Diff line
@@ -685,6 +685,10 @@ static int alpha_pmu_event_init(struct perf_event *event) 
{

	int err;



	/* does not support taken branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;



	switch (event->attr.type) {

	case PERF_TYPE_RAW:

	case PERF_TYPE_HARDWARE:

arch/arm/kernel/perf_event.c

+4 −0
Original line number Diff line number Diff line
@@ -539,6 +539,10 @@ static int armpmu_event_init(struct perf_event *event) 
	int err = 0;

	atomic_t *active_events = &armpmu->active_events;



	/* does not support taken branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;



	if (armpmu->map_event(event) == -ENOENT)

		return -ENOENT;

arch/mips/kernel/perf_event_mipsxx.c

+4 −0
Original line number Diff line number Diff line
@@ -606,6 +606,10 @@ static int mipspmu_event_init(struct perf_event *event) 
{

	int err = 0;



	/* does not support taken branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;



	switch (event->attr.type) {

	case PERF_TYPE_RAW:

	case PERF_TYPE_HARDWARE:

arch/powerpc/kernel/perf_event.c

+4 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,10 @@ static int power_pmu_event_init(struct perf_event *event) 
	if (!ppmu)

		return -ENOENT;



	/* does not support taken branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;



	switch (event->attr.type) {

	case PERF_TYPE_HARDWARE:

		ev = event->attr.config;

arch/sh/kernel/perf_event.c

+4 −0
Original line number Diff line number Diff line
@@ -310,6 +310,10 @@ static int sh_pmu_event_init(struct perf_event *event) 
{

	int err;



	/* does not support taken branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;



	switch (event->attr.type) {

	case PERF_TYPE_RAW:

	case PERF_TYPE_HW_CACHE: