Re: klp: remove superfluous errors in asm/livepatch.h

From: Petr Mladek
Date: Wed Mar 09 2016 - 05:07:03 EST


On Tue 2016-03-08 16:28:20, Jessica Yu wrote:
> >On Fri, 4 Mar 2016, Josh Poimboeuf wrote:
> >>While we're at it, do we even need the '#ifdef CONFIG_LIVEPATCH' in
> >>these files? And in include/linux/livepatch.h?
> >
> >You are right, this seems indeed completely unnecessary. I'll remove it
> >for 4.6 as well, if noone has any objections.
>
> Hm, I should've caught this earlier, but the notifier cleanup patch
> that removes the livepatch module notifier had kernel/module.c include
> livepatch.h for the klp_module_{coming,going} function stubs in the
> !CONFIG_LIVEPATCH case. See here: https://lkml.org/lkml/2016/2/8/1182

Great catch! And you are in time because Mirek has vacation this week :-)

> Looking back, I now don't think it makes sense for module.c to include
> all those livepatch definitions in the first place, since all it
> needed was the klp_module_{coming,going} declarations. I guess my
> question is, since we've removed the #ifdef CONFIG_LIVEPATCH blocks
> from livepatch.h, where might be a better place for the
> klp_module_{coming,going} stubs? Perhaps they could go in module.h
> instead?

I personally prefer to keep the klp_module_{coming,going} declarations
in livepatch.h. It means to keep the '#ifdef CONFIG_LIVEPATCH' there
as well. It is a standard solution. It helps to find things where
one would expect them.

Best Regards,
Petr