[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-cffa59baa5f1cf3e3e9e172697db48912471531c@git.kernel.org>
Date: Mon, 13 Aug 2012 10:10:32 -0700
From: tip-bot for Borislav Petkov <borislav.petkov@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
a.p.zijlstra@...llo.nl, zheng.z.yan@...el.com, tglx@...utronix.de,
borislav.petkov@....com
Subject: [tip:perf/urgent] perf, x86:
Fix uncore_types_exit section mismatch
Commit-ID: cffa59baa5f1cf3e3e9e172697db48912471531c
Gitweb: http://git.kernel.org/tip/cffa59baa5f1cf3e3e9e172697db48912471531c
Author: Borislav Petkov <borislav.petkov@....com>
AuthorDate: Thu, 2 Aug 2012 12:55:27 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 13 Aug 2012 19:01:03 +0200
perf, x86: Fix uncore_types_exit section mismatch
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@...el.com>
Cc: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Borislav Petkov <borislav.petkov@....com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/1339741902-8449-8-git-send-email-zheng.z.yan@intel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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 7563fda..a7ccd68 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -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++)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists