Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a08b6769 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1409332858-29039-1-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 066ce64c

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -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;