Skip to content

Commit a08b676

Browse files
Andi KleenIngo Molnar
authored andcommitted
perf/x86: Fix section mismatch in split uncore driver
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> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: http://lkml.kernel.org/r/1409332858-29039-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 066ce64 commit a08b676

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/perf_event_intel_uncore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ static struct attribute_group uncore_pmu_attr_group = {
661661
.attrs = uncore_pmu_attrs,
662662
};
663663

664-
static int __init uncore_pmu_register(struct intel_uncore_pmu *pmu)
664+
static int uncore_pmu_register(struct intel_uncore_pmu *pmu)
665665
{
666666
int ret;
667667

0 commit comments

Comments
 (0)