2021-07-30 10:27:02

by Jiapeng Chong

Subject: [PATCH] lockdep/selftests: Fix duplicate included locking-selftest-softirq.h

Clean up the following includecheck warning:

./lib/locking-selftest.c: locking-selftest-softirq.h is included more
than once.

Reported-by: Abaci Robot <[email protected]>
Fixes: cae2ed9aa573 ("[PATCH] lockdep: locking API self tests")
Signed-off-by: Jiapeng Chong <[email protected]>
---
lib/locking-selftest.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 161108e..6010445 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -1252,7 +1252,6 @@ static void rwsem_ABBA3(void)
#include "locking-selftest-wlock.h"
GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion2_hard_wlock)

-#include "locking-selftest-softirq.h"
#include "locking-selftest-rlock.h"
GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion2_soft_rlock)

@@ -1306,7 +1305,6 @@ static void rwsem_ABBA3(void)
#include "locking-selftest-wlock.h"
GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion3_hard_wlock)

-#include "locking-selftest-softirq.h"
#include "locking-selftest-rlock.h"
GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion3_soft_rlock)

--
1.8.3.1

2021-07-30 10:37:58

by Boqun Feng

Subject: Re: [PATCH] lockdep/selftests: Fix duplicate included locking-selftest-softirq.h

Hi,

On Fri, Jul 30, 2021 at 06:24:42PM +0800, Jiapeng Chong wrote:
> Clean up the following includecheck warning:
>
> ./lib/locking-selftest.c: locking-selftest-softirq.h is included more
> than once.
>

Those inclusions in the file are used as poor man's template, IOW, the
header files redefine some names so that we can use one template to
generate many similar functions.

So no need to fix, thanks! But if you have a better idea to generate
functions, please let me know ;-)

Regards,
Boqun

> Reported-by: Abaci Robot <[email protected]>
> Fixes: cae2ed9aa573 ("[PATCH] lockdep: locking API self tests")
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> lib/locking-selftest.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
> index 161108e..6010445 100644
> --- a/lib/locking-selftest.c
> +++ b/lib/locking-selftest.c
> @@ -1252,7 +1252,6 @@ static void rwsem_ABBA3(void)
> #include "locking-selftest-wlock.h"
> GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion2_hard_wlock)
>
> -#include "locking-selftest-softirq.h"
> #include "locking-selftest-rlock.h"
> GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion2_soft_rlock)
>
> @@ -1306,7 +1305,6 @@ static void rwsem_ABBA3(void)
> #include "locking-selftest-wlock.h"
> GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion3_hard_wlock)
>
> -#include "locking-selftest-softirq.h"
> #include "locking-selftest-rlock.h"
> GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion3_soft_rlock)
>
> --
> 1.8.3.1
>