Andrew Murray <andrew.murray@xxxxxxx> writes: > Replace checking of perf event exclusion flags with perf macro. > > Signed-off-by: Andrew Murray <andrew.murray@xxxxxxx> > --- > arch/powerpc/perf/hv-24x7.c | 7 +------ > arch/powerpc/perf/hv-gpci.c | 7 +------ > arch/powerpc/perf/imc-pmu.c | 14 ++------------ > 3 files changed, 4 insertions(+), 24 deletions(-) These conversions look fine, thanks. Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> cheers > diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c > index 72238ee..60db22d 100644 > --- a/arch/powerpc/perf/hv-24x7.c > +++ b/arch/powerpc/perf/hv-24x7.c > @@ -1307,12 +1307,7 @@ static int h_24x7_event_init(struct perf_event *event) > } > > /* unsupported modes and filters */ > - if (event->attr.exclude_user || > - event->attr.exclude_kernel || > - event->attr.exclude_hv || > - event->attr.exclude_idle || > - event->attr.exclude_host || > - event->attr.exclude_guest) > + if (event_has_exclude_flags(event)) > return -EINVAL; > > /* no branch sampling */ > diff --git a/arch/powerpc/perf/hv-gpci.c b/arch/powerpc/perf/hv-gpci.c > index 43fabb3..2d2b5c0 100644 > --- a/arch/powerpc/perf/hv-gpci.c > +++ b/arch/powerpc/perf/hv-gpci.c > @@ -233,12 +233,7 @@ static int h_gpci_event_init(struct perf_event *event) > } > > /* unsupported modes and filters */ > - if (event->attr.exclude_user || > - event->attr.exclude_kernel || > - event->attr.exclude_hv || > - event->attr.exclude_idle || > - event->attr.exclude_host || > - event->attr.exclude_guest) > + if (event_has_exclude_flags(event)) > return -EINVAL; > > /* no branch sampling */ > diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c > index 1fafc32b..1ae1d3f 100644 > --- a/arch/powerpc/perf/imc-pmu.c > +++ b/arch/powerpc/perf/imc-pmu.c > @@ -474,12 +474,7 @@ static int nest_imc_event_init(struct perf_event *event) > return -EINVAL; > > /* unsupported modes and filters */ > - if (event->attr.exclude_user || > - event->attr.exclude_kernel || > - event->attr.exclude_hv || > - event->attr.exclude_idle || > - event->attr.exclude_host || > - event->attr.exclude_guest) > + if (event_has_exclude_flags(event)) > return -EINVAL; > > if (event->cpu < 0) > @@ -749,12 +744,7 @@ static int core_imc_event_init(struct perf_event *event) > return -EINVAL; > > /* unsupported modes and filters */ > - if (event->attr.exclude_user || > - event->attr.exclude_kernel || > - event->attr.exclude_hv || > - event->attr.exclude_idle || > - event->attr.exclude_host || > - event->attr.exclude_guest) > + if (event_has_exclude_flags(event)) > return -EINVAL; > > if (event->cpu < 0) > -- > 2.7.4
