diff options
| author | Andi Kleen <ak@linux.intel.com> | 2014-08-29 10:20:58 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:53:08 +0200 |
| commit | a08b6769d4c5e8d2a3192a45e40b3cdcca0da6a1 (patch) | |
| tree | ff95165b2c52967821c6dd452466c9eb63c06bf6 | |
| parent | 066ce64c7e867e95e5fee7c5f6b852710486392a (diff) | |
| download | op-kernel-dev-a08b6769d4c5e8d2a3192a45e40b3cdcca0da6a1.zip op-kernel-dev-a08b6769d4c5e8d2a3192a45e40b3cdcca0da6a1.tar.gz | |
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>
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index 4785ee8..812ec5d 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; |
