On 20.06.12 03:56:06, tip-bot for Yan, Zheng wrote:
> Commit-ID: 14371cce03c2fc393997e17f979e76674b7f392a
> Gitweb: http://git.kernel.org/tip/14371cce03c2fc393997e17f979e76674b7f392a
> Author: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
> AuthorDate: Fri, 15 Jun 2012 14:31:36 +0800
> Committer: Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Mon, 18 Jun 2012 12:13:23 +0200
>
> perf: Add generic PCI uncore PMU device support
>
> This patch adds generic support for uncore PMUs presented as
> PCI devices. (These come in addition to the CPU/MSR based
> uncores.)
>
> Signed-off-by: Zheng Yan <zheng.z.yan@xxxxxxxxx>
> Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Link: http://lkml.kernel.org/r/1339741902-8449-8-git-send-email-zheng.z.yan@xxxxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 175 ++++++++++++++++++++++++-
> arch/x86/kernel/cpu/perf_event_intel_uncore.h | 66 +++++++++
> 2 files changed, 236 insertions(+), 5 deletions(-)
This patch causes a section mismatch, fix below.
-Robert
>From 912df3647e53c7bb1c61fd8fe4366cba1f788755 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@xxxxxxx>
Date: Wed, 20 Jun 2012 18:31:17 +0200
Subject: [PATCH] perf, x86: Fix section mismatch in uncore_pci_init()
Fixing section mismatch in uncore_pci_init():
WARNING: vmlinux.o(.init.text+0x9246): Section mismatch in reference from the function uncore_pci_init() to the function .devexit.text:uncore_pci_remove()
The function __init uncore_pci_init() references
a function __devexit uncore_pci_remove().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __devexit annotation of
uncore_pci_remove() so it may be used outside an exit section.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
---
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 28a8413..6f43f95 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1313,7 +1313,7 @@ static int __devinit uncore_pci_add(struct intel_uncore_type *type,
return 0;
}
-static void __devexit uncore_pci_remove(struct pci_dev *pdev)
+static void uncore_pci_remove(struct pci_dev *pdev)
{
struct intel_uncore_box *box = pci_get_drvdata(pdev);
struct intel_uncore_pmu *pmu = box->pmu;
--
1.7.8.4
--
Advanced Micro Devices, Inc.
Operating System Research Center
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|