Commit c49f5d88 authored by Nick Child's avatar Nick Child Committed by Michael Ellerman
Browse files

powerpc/perf: Add __init attribute to eligible functions 



Some functions defined in 'arch/powerpc/perf' are deserving of an
`__init` macro attribute. These functions are only called by other
initialization functions and therefore should inherit the attribute.
Also, change function declarations in header files to include `__init`.

Signed-off-by: default avatarNick Child <nick.child@ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211216220035.605465-5-nick.child@ibm.com
parent c13f2b2b

arch/powerpc/include/asm/perf_event_server.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct power_pmu { 
#define PPMU_LIMITED_PMC_REQD	2	/* have to put this on a limited PMC */

#define PPMU_ONLY_COUNT_RUN	4	/* only counting in run state */



extern int register_power_pmu(struct power_pmu *);

int __init register_power_pmu(struct power_pmu *pmu);



struct pt_regs;

extern unsigned long perf_misc_flags(struct pt_regs *regs);

arch/powerpc/perf/core-book3s.c

+1 −1
Original line number Diff line number Diff line
@@ -2479,7 +2479,7 @@ static int power_pmu_prepare_cpu(unsigned int cpu) 
	return 0;

}



int register_power_pmu(struct power_pmu *pmu)

int __init register_power_pmu(struct power_pmu *pmu)

{

	if (ppmu)

		return -EBUSY;		/* something's already registered */

arch/powerpc/perf/generic-compat-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static struct power_pmu generic_compat_pmu = { 
	.attr_groups		= generic_compat_pmu_attr_groups,

};



int init_generic_compat_pmu(void)

int __init init_generic_compat_pmu(void)

{

	int rc = 0;

arch/powerpc/perf/internal.h

+9 −9
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
//

// Copyright 2019 Madhavan Srinivasan, IBM Corporation.



extern int init_ppc970_pmu(void);

extern int init_power5_pmu(void);

extern int init_power5p_pmu(void);

extern int init_power6_pmu(void);

extern int init_power7_pmu(void);

extern int init_power8_pmu(void);

extern int init_power9_pmu(void);

extern int init_power10_pmu(void);

extern int init_generic_compat_pmu(void);
 
int __init init_ppc970_pmu(void);

int __init init_power5_pmu(void);

int __init init_power5p_pmu(void);

int __init init_power6_pmu(void);

int __init init_power7_pmu(void);

int __init init_power8_pmu(void);

int __init init_power9_pmu(void);

int __init init_power10_pmu(void);

int __init init_generic_compat_pmu(void);

arch/powerpc/perf/power10-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static struct power_pmu power10_pmu = { 
	.check_attr_config	= power10_check_attr_config,

};



int init_power10_pmu(void)

int __init init_power10_pmu(void)

{

	unsigned int pvr;

	int rc;