mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
55205c916e
This change fixes a linking problem, which happens if oprofile
is selected to be compiled as built-in:
`oprofile_arch_exit' referenced in section `.init.text' of
arch/arm/oprofile/built-in.o: defined in discarded section
`.exit.text' of arch/arm/oprofile/built-in.o
The problem is appeared after commit 87121ca504, which
introduced oprofile_arch_exit() calls from __init function. Note
that the aforementioned commit has been backported to stable
branches, and the problem is known to be reproduced at least
with 3.0.13 and 3.1.5 kernels.
Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@nokia.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/20111222151540.GB16765@erda.amd.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
65 lines
1.4 KiB
C
65 lines
1.4 KiB
C
/*
|
|
* arch/sh/oprofile/init.c
|
|
*
|
|
* Copyright (C) 2003 - 2010 Paul Mundt
|
|
*
|
|
* Based on arch/mips/oprofile/common.c:
|
|
*
|
|
* Copyright (C) 2004, 2005 Ralf Baechle
|
|
* Copyright (C) 2005 MIPS Technologies, Inc.
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/oprofile.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/perf_event.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/processor.h>
|
|
|
|
extern void sh_backtrace(struct pt_regs * const regs, unsigned int depth);
|
|
|
|
#ifdef CONFIG_HW_PERF_EVENTS
|
|
/*
|
|
* This will need to be reworked when multiple PMUs are supported.
|
|
*/
|
|
static char *sh_pmu_op_name;
|
|
|
|
char *op_name_from_perf_id(void)
|
|
{
|
|
return sh_pmu_op_name;
|
|
}
|
|
|
|
int __init oprofile_arch_init(struct oprofile_operations *ops)
|
|
{
|
|
ops->backtrace = sh_backtrace;
|
|
|
|
if (perf_num_counters() == 0)
|
|
return -ENODEV;
|
|
|
|
sh_pmu_op_name = kasprintf(GFP_KERNEL, "%s/%s",
|
|
UTS_MACHINE, perf_pmu_name());
|
|
if (unlikely(!sh_pmu_op_name))
|
|
return -ENOMEM;
|
|
|
|
return oprofile_perf_init(ops);
|
|
}
|
|
|
|
void oprofile_arch_exit(void)
|
|
{
|
|
oprofile_perf_exit();
|
|
kfree(sh_pmu_op_name);
|
|
}
|
|
#else
|
|
int __init oprofile_arch_init(struct oprofile_operations *ops)
|
|
{
|
|
ops->backtrace = sh_backtrace;
|
|
return -ENODEV;
|
|
}
|
|
void oprofile_arch_exit(void) {}
|
|
#endif /* CONFIG_HW_PERF_EVENTS */
|