2021-06-07 10:28:21

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] powerpc: Fix duplicate included _clear.h

Clean up the following includecheck warning:

./arch/powerpc/perf/req-gen/perf.h: _clear.h is included more than once.

No functional change.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
arch/powerpc/perf/req-gen/perf.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/perf/req-gen/perf.h b/arch/powerpc/perf/req-gen/perf.h
index fa9bc80..59fa588 100644
--- a/arch/powerpc/perf/req-gen/perf.h
+++ b/arch/powerpc/perf/req-gen/perf.h
@@ -51,7 +51,6 @@ enum CAT2(NAME_LOWER, _requests) {
* r_fields
* };
*/
-#include "_clear.h"
#define STRUCT_NAME__(name_lower, r_name) name_lower ## _ ## r_name
#define STRUCT_NAME_(name_lower, r_name) STRUCT_NAME__(name_lower, r_name)
#define STRUCT_NAME(r_name) STRUCT_NAME_(NAME_LOWER, r_name)
--
1.8.3.1


2021-06-07 20:04:16

by kernel test robot

[permalink] [raw]
Subject: Re: [PATCH] powerpc: Fix duplicate included _clear.h

Hi Jiapeng,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on powerpc/next]
[also build test WARNING on v5.13-rc5 next-20210607]
[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]

url: https://github.com/0day-ci/linux/commits/Jiapeng-Chong/powerpc-Fix-duplicate-included-_clear-h/20210607-182626
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-allmodconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/9ee542baa91ad7cfa1e498c539ffb42b8d7f07b0
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jiapeng-Chong/powerpc-Fix-duplicate-included-_clear-h/20210607-182626
git checkout 9ee542baa91ad7cfa1e498c539ffb42b8d7f07b0
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>

All warnings (new ones prefixed by >>):

In file included from arch/powerpc/perf/hv-gpci.h:29,
from arch/powerpc/perf/hv-gpci.c:18:
>> arch/powerpc/perf/req-gen/perf.h:57: warning: "REQUEST_" redefined
57 | #define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
|
In file included from arch/powerpc/perf/hv-gpci.h:29,
from arch/powerpc/perf/hv-gpci.c:18:
arch/powerpc/perf/req-gen/perf.h:42: note: this is the location of the previous definition
42 | #define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
|


vim +/REQUEST_ +57 arch/powerpc/perf/req-gen/perf.h

9e9f60108423f1 Cody P Schafer 2015-01-30 47
9e9f60108423f1 Cody P Schafer 2015-01-30 48 /*
9e9f60108423f1 Cody P Schafer 2015-01-30 49 * For each request:
9e9f60108423f1 Cody P Schafer 2015-01-30 50 * struct <NAME_LOWER>_<request name> {
9e9f60108423f1 Cody P Schafer 2015-01-30 51 * r_fields
9e9f60108423f1 Cody P Schafer 2015-01-30 52 * };
9e9f60108423f1 Cody P Schafer 2015-01-30 53 */
9e9f60108423f1 Cody P Schafer 2015-01-30 54 #define STRUCT_NAME__(name_lower, r_name) name_lower ## _ ## r_name
9e9f60108423f1 Cody P Schafer 2015-01-30 55 #define STRUCT_NAME_(name_lower, r_name) STRUCT_NAME__(name_lower, r_name)
9e9f60108423f1 Cody P Schafer 2015-01-30 56 #define STRUCT_NAME(r_name) STRUCT_NAME_(NAME_LOWER, r_name)
9e9f60108423f1 Cody P Schafer 2015-01-30 @57 #define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
9e9f60108423f1 Cody P Schafer 2015-01-30 58 struct STRUCT_NAME(r_name) { \
9e9f60108423f1 Cody P Schafer 2015-01-30 59 r_fields \
9e9f60108423f1 Cody P Schafer 2015-01-30 60 };
9e9f60108423f1 Cody P Schafer 2015-01-30 61 #define __field_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name) \
9e9f60108423f1 Cody P Schafer 2015-01-30 62 BYTES_TO_BE_TYPE(f_bytes) f_name;
9e9f60108423f1 Cody P Schafer 2015-01-30 63 #define __count_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name) \
9e9f60108423f1 Cody P Schafer 2015-01-30 64 __field_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name)
9e9f60108423f1 Cody P Schafer 2015-01-30 65 #define __array_(r_name, r_value, r_idx_1, a_offset, a_bytes, a_name) \
9e9f60108423f1 Cody P Schafer 2015-01-30 66 __u8 a_name[a_bytes];
9e9f60108423f1 Cody P Schafer 2015-01-30 67

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]


Attachments:
(No filename) (3.84 kB)
.config.gz (71.63 kB)
Download all attachments

2021-06-08 02:30:24

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc: Fix duplicate included _clear.h

Jiapeng Chong <[email protected]> writes:
> Clean up the following includecheck warning:
>
> ./arch/powerpc/perf/req-gen/perf.h: _clear.h is included more than once.

That's by design.

See the error reported by the kbuild robot.

> No functional change.

Not true.

cheers

> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> arch/powerpc/perf/req-gen/perf.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/powerpc/perf/req-gen/perf.h b/arch/powerpc/perf/req-gen/perf.h
> index fa9bc80..59fa588 100644
> --- a/arch/powerpc/perf/req-gen/perf.h
> +++ b/arch/powerpc/perf/req-gen/perf.h
> @@ -51,7 +51,6 @@ enum CAT2(NAME_LOWER, _requests) {
> * r_fields
> * };
> */
> -#include "_clear.h"
> #define STRUCT_NAME__(name_lower, r_name) name_lower ## _ ## r_name
> #define STRUCT_NAME_(name_lower, r_name) STRUCT_NAME__(name_lower, r_name)
> #define STRUCT_NAME(r_name) STRUCT_NAME_(NAME_LOWER, r_name)
> --
> 1.8.3.1