| Message ID | 20230718052752.1045248-2-ojeda@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | df3cb7ac0edcc9c850799ae1c7a9cb33e95f834d |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | KUnit integration for Rust doctests | expand |
On Tue, 18 Jul 2023 at 13:28, Miguel Ojeda <ojeda@kernel.org> wrote: > > The header uses `NULL` in both `CONFIG_KUNIT=y` and `=n` cases, > but does not include it explicitly. > > When `CONFIG_KUNIT=y`, the header is already getting included via > the other headers, so it is not a problem for users. > > However, when `CONFIG_KUNIT=n`, it is not, and thus a user could hit > a build error when including `kunit/test-bug.h`, like we are doing > later in this series [1]. > > Thus include `linux/stddef.h`, and do so outside the `#if`, since it > is used in both cases. > > Reported-by: Boqun Feng <boqun.feng@gmail.com> > Closes: https://lore.kernel.org/rust-for-linux/ZJ8cNUW3oR2p+gL1@boqun-archlinux/ [1] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- Reviewed-by: David Gow <davidgow@google.com> Thanks! -- David > include/kunit/test-bug.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/kunit/test-bug.h b/include/kunit/test-bug.h > index 30ca541b6ff2..47aa8f21ccce 100644 > --- a/include/kunit/test-bug.h > +++ b/include/kunit/test-bug.h > @@ -9,6 +9,8 @@ > #ifndef _KUNIT_TEST_BUG_H > #define _KUNIT_TEST_BUG_H > > +#include <linux/stddef.h> /* for NULL */ > + > #if IS_ENABLED(CONFIG_KUNIT) > > #include <linux/jump_label.h> /* For static branch */ > -- > 2.41.0 > > -- > You received this message because you are subscribed to the Google Groups "KUnit Development" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20230718052752.1045248-2-ojeda%40kernel.org.
diff --git a/include/kunit/test-bug.h b/include/kunit/test-bug.h index 30ca541b6ff2..47aa8f21ccce 100644 --- a/include/kunit/test-bug.h +++ b/include/kunit/test-bug.h @@ -9,6 +9,8 @@ #ifndef _KUNIT_TEST_BUG_H #define _KUNIT_TEST_BUG_H +#include <linux/stddef.h> /* for NULL */ + #if IS_ENABLED(CONFIG_KUNIT) #include <linux/jump_label.h> /* For static branch */
The header uses `NULL` in both `CONFIG_KUNIT=y` and `=n` cases, but does not include it explicitly. When `CONFIG_KUNIT=y`, the header is already getting included via the other headers, so it is not a problem for users. However, when `CONFIG_KUNIT=n`, it is not, and thus a user could hit a build error when including `kunit/test-bug.h`, like we are doing later in this series [1]. Thus include `linux/stddef.h`, and do so outside the `#if`, since it is used in both cases. Reported-by: Boqun Feng <boqun.feng@gmail.com> Closes: https://lore.kernel.org/rust-for-linux/ZJ8cNUW3oR2p+gL1@boqun-archlinux/ [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> --- include/kunit/test-bug.h | 2 ++ 1 file changed, 2 insertions(+)