[linux-next:master 5414/6649] lib/zstd/common/debug.h: zstd_deps.h is included more than once.

[linux-next:master 5414/6649] lib/zstd/common/debug.h: zstd_deps.h is included more than once.

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head:   f8dc23b3dc0cc5b32dfd0c446e59377736d073a7
commit: c684b4e9a3013dd0ee02b2e82d8035c2e5486197 [5414/6649] lib: zstd: Upgrade to latest upstream zstd version 1.4.10
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>


includecheck warnings: (new ones prefixed by >>)
>> lib/zstd/common/debug.h: zstd_deps.h is included more than once.

Please review and possibly fold the followup patch.

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

[RFC PATCH linux-next] lib: zstd: fix duplicated inclusion

[kernel test robot]

Generated by: scripts/checkincludes.pl

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
 debug.h |    1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/zstd/common/debug.h b/lib/zstd/common/debug.h
index 6dd88d1fbd02c..c8dc0b1890369 100644
--- a/lib/zstd/common/debug.h
+++ b/lib/zstd/common/debug.h
@@ -65,7 +65,6 @@
 
 #if (DEBUGLEVEL>=1)
 #  define ZSTD_DEPS_NEED_ASSERT
-#  include "zstd_deps.h"
 #else
 #  ifndef assert   /* assert may be already defined, due to prior #include <assert.h> */
 #    define assert(condition) ((void)0)   /* disable assert (default) */

Re: [RFC PATCH linux-next] lib: zstd: fix duplicated inclusion

[Nick Terrell]

> On Oct 7, 2021, at 4:27 PM, kernel test robot <lkp@intel.com> wrote:
> 
> Generated by: scripts/checkincludes.pl
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: kernel test robot <lkp@intel.com>
> ---
> debug.h |    1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/lib/zstd/common/debug.h b/lib/zstd/common/debug.h
> index 6dd88d1fbd02c..c8dc0b1890369 100644
> --- a/lib/zstd/common/debug.h
> +++ b/lib/zstd/common/debug.h
> @@ -65,7 +65,6 @@
> 
> #if (DEBUGLEVEL>=1)
> #  define ZSTD_DEPS_NEED_ASSERT
> -#  include "zstd_deps.h"
> #else
> #  ifndef assert   /* assert may be already defined, due to prior #include <assert.h> */
> #    define assert(condition) ((void)0)   /* disable assert (default) */

This is an intentional design choice of upstream zstd, and is correct.

Defining ZSTD_DEPS_NEED_ASSERT will cause “zstd_deps.h” to
provide a definition of assert(), even if it has already been included.

-Nick