Commit b3b3a9b6 authored by Anand Gadiyar's avatar Anand Gadiyar Committed by Robert Richter

oprofile: fix linker errors

Commit e9677b3c (oprofile, ARM: Use oprofile_arch_exit() to
cleanup on failure) caused oprofile_perf_exit to be called
in the cleanup path of oprofile_perf_init. The __exit tag
for oprofile_perf_exit should therefore be dropped.

The same has to be done for exit_driverfs as well, as this
function is called from oprofile_perf_exit. Else, we get
the following two linker errors.

  LD      .tmp_vmlinux1
`oprofile_perf_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
make: *** [.tmp_vmlinux1] Error 1

  LD      .tmp_vmlinux1
`exit_driverfs' referenced in section `.text' of arch/arm/oprofile/built-in.o: defined in discarded section `.exit.text' of arch/arm/oprofile/built-in.o
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: default avatarAnand Gadiyar <gadiyar@ti.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 277dd984
...@@ -236,7 +236,7 @@ static int __init init_driverfs(void) ...@@ -236,7 +236,7 @@ static int __init init_driverfs(void)
return ret; return ret;
} }
static void __exit exit_driverfs(void) static void exit_driverfs(void)
{ {
platform_device_unregister(oprofile_pdev); platform_device_unregister(oprofile_pdev);
platform_driver_unregister(&oprofile_driver); platform_driver_unregister(&oprofile_driver);
......
...@@ -188,7 +188,7 @@ int oprofile_write_commit(struct op_entry *entry); ...@@ -188,7 +188,7 @@ int oprofile_write_commit(struct op_entry *entry);
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
int __init oprofile_perf_init(struct oprofile_operations *ops); int __init oprofile_perf_init(struct oprofile_operations *ops);
void __exit oprofile_perf_exit(void); void oprofile_perf_exit(void);
char *op_name_from_perf_id(void); char *op_name_from_perf_id(void);
#endif /* CONFIG_PERF_EVENTS */ #endif /* CONFIG_PERF_EVENTS */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment