[PATCH V4 06/10] powerpc, perf: Change the name of HW PMU branch filter tracking variable
This patch simply changes the name of the variable from "bhrb_filter" to "bhrb_hw_filter" in order to add one more variable which will track SW filters in generic powerpc book3s code which will be implemented in the subsequent patch. Signed-off-by: Anshuman Khandual --- arch/powerpc/perf/core-book3s.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 29b89e8..2de7d48 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -47,7 +47,7 @@ struct cpu_hw_events { int n_txn_start; /* BHRB bits */ - u64 bhrb_filter;/* BHRB HW branch filter */ + u64 bhrb_hw_filter; /* BHRB HW branch filter */ int bhrb_users; void*bhrb_context; struct perf_branch_stack bhrb_stack; @@ -1159,7 +1159,7 @@ static void power_pmu_enable(struct pmu *pmu) out: if (cpuhw->bhrb_users) - ppmu->config_bhrb(cpuhw->bhrb_filter); + ppmu->config_bhrb(cpuhw->bhrb_hw_filter); local_irq_restore(flags); } @@ -1254,7 +1254,7 @@ nocheck: out: if (has_branch_stack(event)) { power_pmu_bhrb_enable(event); - cpuhw->bhrb_filter = ppmu->bhrb_filter_map( + cpuhw->bhrb_hw_filter = ppmu->bhrb_filter_map( event->attr.branch_sample_type); } @@ -1637,10 +1637,10 @@ static int power_pmu_event_init(struct perf_event *event) err = power_check_constraints(cpuhw, events, cflags, n + 1); if (has_branch_stack(event)) { - cpuhw->bhrb_filter = ppmu->bhrb_filter_map( + cpuhw->bhrb_hw_filter = ppmu->bhrb_filter_map( event->attr.branch_sample_type); - if(cpuhw->bhrb_filter == -1) + if(cpuhw->bhrb_hw_filter == -1) return -EOPNOTSUPP; } -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH V4 06/10] powerpc, perf: Change the name of HW PMU branch filter tracking variable
This patch simply changes the name of the variable from bhrb_filter to bhrb_hw_filter in order to add one more variable which will track SW filters in generic powerpc book3s code which will be implemented in the subsequent patch. Signed-off-by: Anshuman Khandual khand...@linux.vnet.ibm.com --- arch/powerpc/perf/core-book3s.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 29b89e8..2de7d48 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -47,7 +47,7 @@ struct cpu_hw_events { int n_txn_start; /* BHRB bits */ - u64 bhrb_filter;/* BHRB HW branch filter */ + u64 bhrb_hw_filter; /* BHRB HW branch filter */ int bhrb_users; void*bhrb_context; struct perf_branch_stack bhrb_stack; @@ -1159,7 +1159,7 @@ static void power_pmu_enable(struct pmu *pmu) out: if (cpuhw-bhrb_users) - ppmu-config_bhrb(cpuhw-bhrb_filter); + ppmu-config_bhrb(cpuhw-bhrb_hw_filter); local_irq_restore(flags); } @@ -1254,7 +1254,7 @@ nocheck: out: if (has_branch_stack(event)) { power_pmu_bhrb_enable(event); - cpuhw-bhrb_filter = ppmu-bhrb_filter_map( + cpuhw-bhrb_hw_filter = ppmu-bhrb_filter_map( event-attr.branch_sample_type); } @@ -1637,10 +1637,10 @@ static int power_pmu_event_init(struct perf_event *event) err = power_check_constraints(cpuhw, events, cflags, n + 1); if (has_branch_stack(event)) { - cpuhw-bhrb_filter = ppmu-bhrb_filter_map( + cpuhw-bhrb_hw_filter = ppmu-bhrb_filter_map( event-attr.branch_sample_type); - if(cpuhw-bhrb_filter == -1) + if(cpuhw-bhrb_hw_filter == -1) return -EOPNOTSUPP; } -- 1.7.11.7 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/