Patch "oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue" has been added to the 3.0-stable tree

[<gr...@su...>]

This is a note to let you know that I've just added the patch titled

    oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

to the 3.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     oprofile-arm-sh-fix-oprofile_arch_exit-linkage-issue.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <st...@vg...> know about it.


>From 55205c916e179e09773d98d290334d319f45ac6b Mon Sep 17 00:00:00 2001
From: Vladimir Zapolskiy <vla...@no...>
Date: Thu, 22 Dec 2011 16:15:40 +0100
Subject: oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

From: Vladimir Zapolskiy <vla...@no...>

commit 55205c916e179e09773d98d290334d319f45ac6b upstream.

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 <vla...@no...>
Signed-off-by: Robert Richter <rob...@am...>
Cc: Will Deacon <wil...@ar...>
Cc: oprofile-list <opr...@li...>
Link: http://lkml.kernel.org/r/201...@er...
Signed-off-by: Ingo Molnar <mi...@el...>
Signed-off-by: Greg Kroah-Hartman <gr...@su...>

---
 arch/arm/oprofile/common.c |    2 +-
 arch/sh/oprofile/common.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct opr
 	return oprofile_perf_init(ops);
 }
 
-void __exit oprofile_arch_exit(void)
+void oprofile_arch_exit(void)
 {
 	oprofile_perf_exit();
 }
--- a/arch/sh/oprofile/common.c
+++ b/arch/sh/oprofile/common.c
@@ -49,7 +49,7 @@ int __init oprofile_arch_init(struct opr
 	return oprofile_perf_init(ops);
 }
 
-void __exit oprofile_arch_exit(void)
+void oprofile_arch_exit(void)
 {
 	oprofile_perf_exit();
 	kfree(sh_pmu_op_name);
@@ -60,5 +60,5 @@ int __init oprofile_arch_init(struct opr
 	ops->backtrace = sh_backtrace;
 	return -ENODEV;
 }
-void __exit oprofile_arch_exit(void) {}
+void oprofile_arch_exit(void) {}
 #endif /* CONFIG_HW_PERF_EVENTS */


Patches currently in stable-queue which might be from vla...@no... are

queue-3.0/oprofile-arm-sh-fix-oprofile_arch_exit-linkage-issue.patch