diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-06 20:46:32 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-06 20:46:32 +0300 |
| commit | 32e940f2bd3b16551f23ea44be47f6f5d1746d64 (patch) | |
| tree | 23037a80fd683ff1a52ca05e2d7432c0cbc8f98b /tools/include/linux/args.h | |
| parent | 477174ac35c510d0ed3043f5bd4fba25546a21ce (diff) | |
| parent | 1dde502587657045b267f179d7a1ecc7b8a1a265 (diff) | |
| download | linux-32e940f2bd3b16551f23ea44be47f6f5d1746d64.tar.xz | |
Merge branch 'for-7.0-fixes' into for-7.1
To prepare for hierarchical scheduling patchset which will cause multiple
conflicts otherwise.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/include/linux/args.h')
| -rw-r--r-- | tools/include/linux/args.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/include/linux/args.h b/tools/include/linux/args.h index 2e8e65d975c7..14b268f2389a 100644 --- a/tools/include/linux/args.h +++ b/tools/include/linux/args.h @@ -22,7 +22,11 @@ #define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) /* Concatenate two parameters, but allow them to be expanded beforehand. */ +#ifndef __CONCAT #define __CONCAT(a, b) a ## b +#endif +#ifndef CONCATENATE #define CONCATENATE(a, b) __CONCAT(a, b) +#endif #endif /* _LINUX_ARGS_H */ |