]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
perf, x86: Fix uncore_types_exit section mismatch
authorBorislav Petkov <borislav.petkov@amd.com>
Thu, 2 Aug 2012 10:55:27 +0000 (12:55 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 13 Aug 2012 17:01:03 +0000 (19:01 +0200)
Fix the following section mismatch:

WARNING: arch/x86/kernel/cpu/built-in.o(.text+0x7ad9): Section mismatch in reference from the function uncore_types_exit() to the function .init.text:uncore_type_exit()

The function uncore_types_exit() references the function __init
uncore_type_exit().  This is often because uncore_types_exit lacks a
__init annotation or the annotation of uncore_type_exit is wrong.

caused by 14371cce03c2 ("perf: Add generic PCI uncore PMU device
support").

Cc: Zheng Yan <zheng.z.yan@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1339741902-8449-8-git-send-email-zheng.z.yan@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/cpu/perf_event_intel_uncore.c

index 7563fda9f0339b935c7b40a347409b966f7ffbdc..a7ccd68aa13ab06aa5f5979273eb9e20ebdd6f4d 100644 (file)
@@ -2373,7 +2373,7 @@ static void __init uncore_type_exit(struct intel_uncore_type *type)
        type->attr_groups[1] = NULL;
 }
 
-static void uncore_types_exit(struct intel_uncore_type **types)
+static void __init uncore_types_exit(struct intel_uncore_type **types)
 {
        int i;
        for (i = 0; types[i]; i++)