On Mon, Apr 28, 2014 at 08:03:35PM +0100, Will Deacon wrote:
> By the time rcutorture is initialised via its module_init callback, the
> .init.text section of torture.ko has already been freed, so the calls to
> torture_init{begin,end} end up branching to junk.
>
> This patch removes the __init annotations from torture_init_{begin,end}
> to make sure the code is there when we want to call it.
>
> Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com>
> Cc: Josh Triplett <j...@joshtriplett.org>
> Signed-off-by: Will Deacon <will.dea...@arm.com>
Good catch, and apologies for the wasted day, but someone beat you to
this. By only 12 days, which is a bit surprising given how long this
has been lurking.
Thanx, Paul
> ---
>
> Just lost a day to this -- I was sure my static relocation handling must
> be to blame!
>
> kernel/torture.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/torture.c b/kernel/torture.c
> index acc9afc2f26e..d5ef30ce6eb5 100644
> --- a/kernel/torture.c
> +++ b/kernel/torture.c
> @@ -596,7 +596,7 @@ static void torture_stutter_cleanup(void)
> * The runnable parameter points to a flag that controls whether or not
> * the test is currently runnable. If there is no such flag, pass in NULL.
> */
> -void __init torture_init_begin(char *ttype, bool v, int *runnable)
> +void torture_init_begin(char *ttype, bool v, int *runnable)
> {
> mutex_lock(&fullstop_mutex);
> torture_type = ttype;
> @@ -610,7 +610,7 @@ EXPORT_SYMBOL_GPL(torture_init_begin);
> /*
> * Tell the torture module that initialization is complete.
> */
> -void __init torture_init_end(void)
> +void torture_init_end(void)
> {
> mutex_unlock(&fullstop_mutex);
> register_reboot_notifier(&torture_shutdown_nb);
> --
> 1.9.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
