From: Matthew Wilcox <willy@infradead.org>
Date: Thu, 20 Dec 2018 02:28:39 +0000 (-0500)
Subject: maple_tree: Fix compilation differently
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=23be366c203a08836c2f8194969a2ac691c56f19;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Fix compilation differently

Signed-off-by: Matthew Wilcox <willy@infradead.org>
---

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index 369977f642073..eca9137a189d1 100644
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -25,7 +25,6 @@
  *
  * Nodes in the tree point to their parent unless bit 0 is set.
  */
-#define CONFIG_64BIT
 #ifdef CONFIG_64BIT
 #define MAPLE_NODE_SLOTS	15	/* 128 bytes including ->parent */
 #define MAPLE_RANGE64_SLOTS	8	/* 128 bytes */
diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile
index adb99e27e8630..0aad7e2ec4c9f 100644
--- a/tools/testing/radix-tree/Makefile
+++ b/tools/testing/radix-tree/Makefile
@@ -7,6 +7,7 @@ LDLIBS+= -lpthread -lurcu
 TARGETS = main idr-test multiorder xarray maple
 CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o maple.o
 OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \
+	 regression4.o \
 	 tag_check.o multiorder.o idr-test.o iteration_check.o benchmark.o
 
 ifndef SHIFT
diff --git a/tools/testing/radix-tree/generated/autoconf.h b/tools/testing/radix-tree/generated/autoconf.h
index 2218b3cc184e4..e7da803502362 100644
--- a/tools/testing/radix-tree/generated/autoconf.h
+++ b/tools/testing/radix-tree/generated/autoconf.h
@@ -1 +1,2 @@
 #define CONFIG_XARRAY_MULTI 1
+#define CONFIG_64BIT 1