From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id B82B51A01CC for ; Tue, 30 Jun 2015 18:34:38 +1000 (AEST) Received: from e28smtp02.in.ibm.com (e28smtp02.in.ibm.com [122.248.162.2]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E762D14030D for ; Tue, 30 Jun 2015 18:34:37 +1000 (AEST) Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 30 Jun 2015 14:04:35 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 84AF4E005C for ; Tue, 30 Jun 2015 14:08:13 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t5U8YRoa49610764 for ; Tue, 30 Jun 2015 14:04:30 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t5U8YPBo020316 for ; Tue, 30 Jun 2015 14:04:26 +0530 From: Anshuman Khandual To: linuxppc-dev@ozlabs.org Cc: mikey@neuling.org, sukadev@linux.vnet.ibm.com, dja@axtens.net, mpe@ellerman.id.au Subject: [PATCH V10 3/8] powerpc/perf: Change the name of HW PMU branch filter tracking variable Date: Tue, 30 Jun 2015 14:04:17 +0530 Message-Id: <1435653262-24258-4-git-send-email-khandual@linux.vnet.ibm.com> In-Reply-To: <1435653262-24258-1-git-send-email-khandual@linux.vnet.ibm.com> References: <1435653262-24258-1-git-send-email-khandual@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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. This patch does not change any functionality. 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 6935660..ef0ff05 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -52,7 +52,7 @@ struct cpu_hw_events { int n_txn_start; /* BHRB bits */ - u64 bhrb_filter; /* BHRB HW branch filter */ + u64 bhrb_hw_filter; /* BHRB HW filter */ unsigned int bhrb_users; void *bhrb_context; struct perf_branch_stack bhrb_stack; @@ -1357,7 +1357,7 @@ static void power_pmu_enable(struct pmu *pmu) mb(); if (cpuhw->bhrb_users) - ppmu->config_bhrb(cpuhw->bhrb_filter); + ppmu->config_bhrb(cpuhw->bhrb_hw_filter); write_mmcr0(cpuhw, mmcr0); @@ -1465,7 +1465,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); } @@ -1848,10 +1848,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; } -- 2.1.0