On 07/27/2017 05:30 PM, Jan Kiszka wrote: > On 2017-07-27 13:15, Jan Kiszka wrote: >> On 2017-07-26 18:59, Philippe Gerum wrote: >>> On 07/26/2017 06:53 PM, git repository hosting wrote: >>>> Module: xenomai-jki >>>> Branch: for-forge >>>> Commit: 634a95c9c023dda40607e5e5c1dd43761f59e541 >>>> URL: >>>> http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=634a95c9c023dda40607e5e5c1dd43761f59e541 >>>> >>>> Author: Jan Kiszka <[email protected]> >>>> Date: Wed Jul 26 18:50:43 2017 +0200 >>>> >>>> cobalt: Fix conditional build of lock_vfile registration >>>> >>>> There is and there was never a CONFIG_XENO_DEBUG_LOCKING. >>>> Fixes de66d324a93d. >>>> >>>> Signed-off-by: Jan Kiszka <[email protected]> >>>> >>>> --- >>>> >>>> kernel/cobalt/procfs.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/kernel/cobalt/procfs.c b/kernel/cobalt/procfs.c >>>> index 9d193af..85aea0c 100644 >>>> --- a/kernel/cobalt/procfs.c >>>> +++ b/kernel/cobalt/procfs.c >>>> @@ -216,7 +216,7 @@ static struct xnvfile_regular apc_vfile = { >>>> void xnprocfs_cleanup_tree(void) >>>> { >>>> #ifdef CONFIG_XENO_OPT_DEBUG >>>> -#ifdef CONFIG_XENO_DEBUG_LOCKING >>> >>> This would reintroduce another bug [1]. Better check for the proper >>> symbol instead, i.e. CONFIG_XENO_OPT_DEBUG_LOCKING. >> >> That won't solve the issue either. There is something more seriously >> broken in the dependencies. Analyzing.... >> > > The problem is that #if IS_ENABLED() does not update the dependencies of > that file so that kbuild does not recompile what is actually affected by > config changes. A clean rebuild will work. > > Solution is to replace *all* #if IS_ENABLED() by proper #ifdef. >
Yes, this was the purpose of the initial fix, which used the wrong symbol though. Because the deps was broken, we ended up with some files not being rebuilt when switching between debug modes, leaving xnlock_stats undefined in some cases. We only need to fix the symbol, i.e. #ifdef CONFIG_XENO_DEBUG_LOCKING, and all other occurrences of similar constructs. -- Philippe. _______________________________________________ Xenomai mailing list [email protected] https://xenomai.org/mailman/listinfo/xenomai
