Skip to content

Commit

Permalink
tools: fix shared radix-tree build
Browse files Browse the repository at this point in the history
The shared radix-tree build is not correctly recompiling when
lib/maple_tree.c and lib/test_maple_tree.c are modified - fix this by
adding these core components to the SHARED_DEPS list.

Additionally, add missing header guards to shared header files.

Link: https://lkml.kernel.org/r/20240924180724.112169-1-lorenzo.stoakes@oracle.com
Fixes: 74579d8 ("tools: separate out shared radix-tree components")
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Tested-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Lorenzo Stoakes authored and Andrew Morton committed Sep 26, 2024
1 parent abf2050 commit c234c65
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
4 changes: 4 additions & 0 deletions tools/testing/shared/maple-shared.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __MAPLE_SHARED_H__
#define __MAPLE_SHARED_H__

#define CONFIG_DEBUG_MAPLE_TREE
#define CONFIG_MAPLE_SEARCH
Expand All @@ -7,3 +9,5 @@
#include <stdlib.h>
#include <time.h>
#include "linux/init.h"

#endif /* __MAPLE_SHARED_H__ */
4 changes: 4 additions & 0 deletions tools/testing/shared/shared.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __SHARED_H__
#define __SHARED_H__

#include <linux/types.h>
#include <linux/bug.h>
Expand Down Expand Up @@ -31,3 +33,5 @@
#ifndef dump_stack
#define dump_stack() assert(0)
#endif

#endif /* __SHARED_H__ */
4 changes: 3 additions & 1 deletion tools/testing/shared/shared.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ SHARED_DEPS = Makefile ../shared/shared.mk ../shared/*.h generated/map-shift.h \
../../../include/linux/maple_tree.h \
../../../include/linux/radix-tree.h \
../../../lib/radix-tree.h \
../../../include/linux/idr.h
../../../include/linux/idr.h \
../../../lib/maple_tree.c \
../../../lib/test_maple_tree.c

ifndef SHIFT
SHIFT=3
Expand Down
4 changes: 4 additions & 0 deletions tools/testing/shared/xarray-shared.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __XARRAY_SHARED_H__
#define __XARRAY_SHARED_H__

#define XA_DEBUG
#include "shared.h"

#endif /* __XARRAY_SHARED_H__ */

0 comments on commit c234c65

Please sign in to comment.