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: Nick Child <nick.child@ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20211216220035.605465-5-nick.child@ibm.com
This commit is contained in:
parent
c13f2b2bb5
commit
c49f5d88ff
|
@ -98,7 +98,7 @@ struct power_pmu {
|
||||||
#define PPMU_LIMITED_PMC_REQD 2 /* have to put this on a limited PMC */
|
#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 */
|
#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;
|
struct pt_regs;
|
||||||
extern unsigned long perf_misc_flags(struct pt_regs *regs);
|
extern unsigned long perf_misc_flags(struct pt_regs *regs);
|
||||||
|
|
|
@ -2479,7 +2479,7 @@ static int power_pmu_prepare_cpu(unsigned int cpu)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int register_power_pmu(struct power_pmu *pmu)
|
int __init register_power_pmu(struct power_pmu *pmu)
|
||||||
{
|
{
|
||||||
if (ppmu)
|
if (ppmu)
|
||||||
return -EBUSY; /* something's already registered */
|
return -EBUSY; /* something's already registered */
|
||||||
|
|
|
@ -307,7 +307,7 @@ static struct power_pmu generic_compat_pmu = {
|
||||||
.attr_groups = generic_compat_pmu_attr_groups,
|
.attr_groups = generic_compat_pmu_attr_groups,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_generic_compat_pmu(void)
|
int __init init_generic_compat_pmu(void)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
//
|
//
|
||||||
// Copyright 2019 Madhavan Srinivasan, IBM Corporation.
|
// Copyright 2019 Madhavan Srinivasan, IBM Corporation.
|
||||||
|
|
||||||
extern int init_ppc970_pmu(void);
|
int __init init_ppc970_pmu(void);
|
||||||
extern int init_power5_pmu(void);
|
int __init init_power5_pmu(void);
|
||||||
extern int init_power5p_pmu(void);
|
int __init init_power5p_pmu(void);
|
||||||
extern int init_power6_pmu(void);
|
int __init init_power6_pmu(void);
|
||||||
extern int init_power7_pmu(void);
|
int __init init_power7_pmu(void);
|
||||||
extern int init_power8_pmu(void);
|
int __init init_power8_pmu(void);
|
||||||
extern int init_power9_pmu(void);
|
int __init init_power9_pmu(void);
|
||||||
extern int init_power10_pmu(void);
|
int __init init_power10_pmu(void);
|
||||||
extern int init_generic_compat_pmu(void);
|
int __init init_generic_compat_pmu(void);
|
||||||
|
|
|
@ -592,7 +592,7 @@ static struct power_pmu power10_pmu = {
|
||||||
.check_attr_config = power10_check_attr_config,
|
.check_attr_config = power10_check_attr_config,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power10_pmu(void)
|
int __init init_power10_pmu(void)
|
||||||
{
|
{
|
||||||
unsigned int pvr;
|
unsigned int pvr;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
|
@ -677,7 +677,7 @@ static struct power_pmu power5p_pmu = {
|
||||||
.cache_events = &power5p_cache_events,
|
.cache_events = &power5p_cache_events,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power5p_pmu(void)
|
int __init init_power5p_pmu(void)
|
||||||
{
|
{
|
||||||
if (!cur_cpu_spec->oprofile_cpu_type ||
|
if (!cur_cpu_spec->oprofile_cpu_type ||
|
||||||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")
|
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")
|
||||||
|
|
|
@ -618,7 +618,7 @@ static struct power_pmu power5_pmu = {
|
||||||
.flags = PPMU_HAS_SSLOT,
|
.flags = PPMU_HAS_SSLOT,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power5_pmu(void)
|
int __init init_power5_pmu(void)
|
||||||
{
|
{
|
||||||
if (!cur_cpu_spec->oprofile_cpu_type ||
|
if (!cur_cpu_spec->oprofile_cpu_type ||
|
||||||
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5"))
|
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5"))
|
||||||
|
|
|
@ -539,7 +539,7 @@ static struct power_pmu power6_pmu = {
|
||||||
.cache_events = &power6_cache_events,
|
.cache_events = &power6_cache_events,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power6_pmu(void)
|
int __init init_power6_pmu(void)
|
||||||
{
|
{
|
||||||
if (!cur_cpu_spec->oprofile_cpu_type ||
|
if (!cur_cpu_spec->oprofile_cpu_type ||
|
||||||
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6"))
|
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6"))
|
||||||
|
|
|
@ -445,7 +445,7 @@ static struct power_pmu power7_pmu = {
|
||||||
.cache_events = &power7_cache_events,
|
.cache_events = &power7_cache_events,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power7_pmu(void)
|
int __init init_power7_pmu(void)
|
||||||
{
|
{
|
||||||
if (!cur_cpu_spec->oprofile_cpu_type ||
|
if (!cur_cpu_spec->oprofile_cpu_type ||
|
||||||
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
|
strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
|
||||||
|
|
|
@ -378,7 +378,7 @@ static struct power_pmu power8_pmu = {
|
||||||
.bhrb_nr = 32,
|
.bhrb_nr = 32,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power8_pmu(void)
|
int __init init_power8_pmu(void)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
|
|
@ -452,7 +452,7 @@ static struct power_pmu power9_pmu = {
|
||||||
.check_attr_config = power9_check_attr_config,
|
.check_attr_config = power9_check_attr_config,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_power9_pmu(void)
|
int __init init_power9_pmu(void)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
unsigned int pvr = mfspr(SPRN_PVR);
|
unsigned int pvr = mfspr(SPRN_PVR);
|
||||||
|
|
|
@ -489,7 +489,7 @@ static struct power_pmu ppc970_pmu = {
|
||||||
.flags = PPMU_NO_SIPR | PPMU_NO_CONT_SAMPLING,
|
.flags = PPMU_NO_SIPR | PPMU_NO_CONT_SAMPLING,
|
||||||
};
|
};
|
||||||
|
|
||||||
int init_ppc970_pmu(void)
|
int __init init_ppc970_pmu(void)
|
||||||
{
|
{
|
||||||
if (!cur_cpu_spec->oprofile_cpu_type ||
|
if (!cur_cpu_spec->oprofile_cpu_type ||
|
||||||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
|
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
|
||||||
|
|
Loading…
Reference in New Issue