Skip to contentSkip to conversation

minmax: Fix header inclusions

PATCH Superseded Andy Shevchenko 3 participants 7 messages Jul 21, 2023 – Jul 27, 2023 Memory management

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 minmax: Fix header inclusions

BUILD_BUG_ON*() are defined in build_bug.h.
It also provides __UNIQUE_ID() that is defined
in the compiler.h.

---
 include/linux/minmax.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/minmax.h +1 -0
index 798c6963909f..049480235e53 100644
@@ -2,6 +2,7 @@
 #ifndef _LINUX_MINMAX_H
 #define _LINUX_MINMAX_H
 
+#include <linux/build_bug.h>
 #include <linux/const.h>
 
 /*
Signature · 1 line
2.40.0.1.gaa8946217a0b
Reviewed-by on v1 1/1
#1 lore raw

Hi Andy,

Quoted 14 lines · On Fri, 21 Jul 2023 16:39:32 +0300 Andy Shevchenko…

BUILD_BUG_ON*() are defined in build_bug.h.
It also provides __UNIQUE_ID() that is defined
in the compiler.h.

---
 include/linux/minmax.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/minmax.h +0 -0
index 798c6963909f..049480235e53 100644

include/linux/minmax.h line 8

Quoted 7 lines
include/linux/minmax.h +1 -0
@@ -2,6 +2,7 @@
 #ifndef _LINUX_MINMAX_H
 #define _LINUX_MINMAX_H
 
+#include <linux/build_bug.h>
 #include <linux/const.h>
 
 /*

Best regards,
Hervé

#3 lore raw
Quoted 10 lines · Andy Shevchenko
Quoted 4 lines · Herve Codina

On Fri, 21 Jul 2023 16:39:32 +0300
Andy Shevchenko <[email protected]> wrote:

Thank you!

Note, the https://lore.kernel.org/all/[email protected]/
has a fix to the broken builds the LKP reported about.

Andrew, since the build fix is in your tree, can you apply this one on top of that, please?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
In reply to Andy Shevchenko
kernel test robot noticed the following build errors:

Hi Andy,

kernel test robot noticed the following build errors:

[auto build test ERROR on linus/master]
[also build test ERROR on crng-random/master v6.5-rc2 next-20230721] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/minmax-Fix-header-inclusions/20230721-214152
base:   linus/master
patch link:    https://lore.kernel.org/r/20230721133932.12679-1-andriy.shevchenko%40linux.intel.com
patch subject: [PATCH v1 1/1] minmax: Fix header inclusions
config: um-allnoconfig (https://download.01.org/0day-ci/archive/20230721/[email protected]/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
reproduce: (https://download.01.org/0day-ci/archive/20230721/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

In file included from arch/um/os-Linux/sigio.c:6:
In file included from include/linux/minmax.h:5:
In file included from include/linux/build_bug.h:5:

>> include/linux/compiler.h:246:10: fatal error: 'asm/rwonce.h' file not found
     246 | #include <asm/rwonce.h>
         |          ^~~~~~~~~~~~~~

1 error generated.

vim +246 include/linux/compiler.h

a9a3ed1eff3601 Borislav Petkov 2020-04-22 245
e506ea451254ab Will Deacon 2019-10-15 @246 #include <asm/rwonce.h>
e506ea451254ab Will Deacon 2019-10-15 247

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#5 lore raw
Quoted 3 lines · kernel test robot

Hi Andy,

kernel test robot noticed the following build errors:

Oh my...
UM without this header or even a stub?!

Hmm... Which one else? Let's wait a few days to see.

Quoted 6 lines

In file included from arch/um/os-Linux/sigio.c:6:
In file included from include/linux/minmax.h:5:
In file included from include/linux/build_bug.h:5:

Quoted 1 line
Quoted 1 line

include/linux/compiler.h:246:10: fatal error: 'asm/rwonce.h' file not found

     246 | #include <asm/rwonce.h>
         |          ^~~~~~~~~~~~~~
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw
In reply to Andy Shevchenko
kernel test robot noticed the following build errors:

Hi Andy,

kernel test robot noticed the following build errors:

[auto build test ERROR on linus/master]
[also build test ERROR on crng-random/master v6.5-rc2 next-20230721] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/minmax-Fix-header-inclusions/20230721-214152
base:   linus/master
patch link:    https://lore.kernel.org/r/20230721133932.12679-1-andriy.shevchenko%40linux.intel.com
patch subject: [PATCH v1 1/1] minmax: Fix header inclusions
config: um-randconfig-r021-20230720 (https://download.01.org/0day-ci/archive/20230721/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230721/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

In file included from include/linux/build_bug.h:5,
from include/linux/minmax.h:5, from arch/um/os-Linux/sigio.c:6:

>> include/linux/compiler.h:246:10: fatal error: asm/rwonce.h: No such file or directory
     246 | #include <asm/rwonce.h>
         |          ^~~~~~~~~~~~~~

compilation terminated.

vim +246 include/linux/compiler.h

a9a3ed1eff3601 Borislav Petkov 2020-04-22 245
e506ea451254ab Will Deacon 2019-10-15 @246 #include <asm/rwonce.h>
e506ea451254ab Will Deacon 2019-10-15 247

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki