Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH] perf, x86: Fix section mismatch in split uncore driver | Date | Fri, 29 Aug 2014 10:20:58 -0700 |
| |
From: Andi Kleen <ak@linux.intel.com>
The new split Intel uncore driver code that recently went into tip added a section mismatch, which the build process complains about.
uncore_pmu_register can be called from uncore_pci_probe, which is not __init and can be called from pci driver ->probe. I'm not fully sure if it's actually possible to call the probe function later, but it seems safer to mark uncore_pmu_register not __init.
This also fixes the warning.
Signed-off-by: Andi Kleen <ak@linux.intel.com> --- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index b0c48bf..42d00e5 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -661,7 +661,7 @@ static struct attribute_group uncore_pmu_attr_group = { .attrs = uncore_pmu_attrs, }; -static int __init uncore_pmu_register(struct intel_uncore_pmu *pmu) +static int uncore_pmu_register(struct intel_uncore_pmu *pmu) { int ret; -- 1.9.3
| |