diff options
| author | Lorenzo Stoakes <lorenzo.stoakes@oracle.com> | 2025-08-11 06:26:54 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2025-08-19 16:35:54 -0700 |
| commit | 9a6a6a3191574a01dcf7a7d9385246d7bc8736bc (patch) | |
| tree | 72eaf2cd9c4f8b4d4fa87287389bc2272d5da4e3 /tools/testing/shared | |
| parent | mm/debug_vm_pgtable: clear page table entries at destroy_args() (diff) | |
| download | linux-9a6a6a3191574a01dcf7a7d9385246d7bc8736bc.tar.gz linux-9a6a6a3191574a01dcf7a7d9385246d7bc8736bc.zip | |
tools/testing: add linux/args.h header and fix radix, VMA tests
Commit 857d18f23ab1 ("cleanup: Introduce ACQUIRE() and ACQUIRE_ERR() for
conditional locks") accidentally broke the radix tree, VMA userland tests
by including linux/args.h which is not present in the tools/include
directory.
This patch copies this over and adds an #ifdef block to avoid duplicate
__CONCAT declaration in conflict with system headers when we ultimately
include this.
Link: https://lkml.kernel.org/r/20250811052654.33286-1-lorenzo.stoakes@oracle.com
Fixes: 857d18f23ab1 ("cleanup: Introduce ACQUIRE() and ACQUIRE_ERR() for conditional locks")
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Jann Horn <jannh@google.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'tools/testing/shared')
| -rw-r--r-- | tools/testing/shared/linux/idr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/shared/linux/idr.h b/tools/testing/shared/linux/idr.h index 4e342f2e37cf..676c5564e33f 100644 --- a/tools/testing/shared/linux/idr.h +++ b/tools/testing/shared/linux/idr.h @@ -1 +1,5 @@ +/* Avoid duplicate definitions due to system headers. */ +#ifdef __CONCAT +#undef __CONCAT +#endif #include "../../../../include/linux/idr.h" |