Skip to content

Commit

Permalink
ARM: oprofile: Move non-ARM code into separate init/exit
Browse files Browse the repository at this point in the history
In preparation for moving the majority of this oprofile code into an
architecture-neutral place separate the architecture-independent code
into oprofile_perf_init() and oprofile_perf_exit().

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
  • Loading branch information
Matt Fleming authored and Robert Richter committed Oct 11, 2010
1 parent 80e96b1 commit 58850e2
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions arch/arm/oprofile/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
tail = user_backtrace(tail);
}

int __init oprofile_arch_init(struct oprofile_operations *ops)
int __init oprofile_perf_init(struct oprofile_operations *ops)
{
int cpu, ret = 0;

Expand Down Expand Up @@ -387,7 +387,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
}
}

ops->backtrace = arm_backtrace;
ops->create_files = oprofile_perf_create_files;
ops->setup = oprofile_perf_setup;
ops->start = oprofile_perf_start;
Expand All @@ -410,7 +409,14 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
return ret;
}

void __exit oprofile_arch_exit(void)
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
ops->backtrace = arm_backtrace;

return oprofile_perf_init(ops);
}

void __exit oprofile_perf_exit(void)
{
int cpu, id;
struct perf_event *event;
Expand All @@ -428,6 +434,11 @@ void __exit oprofile_arch_exit(void)
kfree(counter_config);
exit_driverfs();
}

void __exit oprofile_arch_exit(void)
{
oprofile_perf_exit();
}
#else
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
Expand Down

0 comments on commit 58850e2

Please sign in to comment.