Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58850e21 authored by Matt Fleming's avatar Matt Fleming Committed by Robert Richter
Browse files

ARM: oprofile: Move non-ARM code into separate init/exit 



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: default avatarMatt Fleming <matt@console-pimps.org>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 80e96b11

arch/arm/oprofile/common.c

+14 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -410,7 +409,14 @@ out: 
	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;
@@ -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)

{