Commit b3b3a9b6 authored Oct 14, 2010 by Anand Gadiyar Committed by Robert Richter Oct 15, 2010

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: Anand Gadiyar <gadiyar@ti.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>

parent 277dd984

drivers/oprofile/oprofile_perf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ static int __init init_driverfs(void)
		return ret;
		}

		static void __exit exit_driverfs(void)
		static void exit_driverfs(void)
		{
		platform_device_unregister(oprofile_pdev);
		platform_driver_unregister(&oprofile_driver);

include/linux/oprofile.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ int oprofile_write_commit(struct op_entry *entry);

		#ifdef CONFIG_PERF_EVENTS
		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);
		#endif /* CONFIG_PERF_EVENTS */

Admin message