| Message ID | 20250325121624.523258-32-guoren@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | rv64ilp32_abi: Build CONFIG_64BIT kernel-self with ILP32 ABI | expand |
* guoren@kernel.org <guoren@kernel.org> [250325 08:24]: > From: "Guo Ren (Alibaba DAMO Academy)" <guoren@kernel.org> > > The Maple tree algorithm uses ulong type for each element. The > number of slots is based on BITS_PER_LONG for RV64ILP32 ABI, so > use BITS_PER_LONG instead of CONFIG_64BIT. > > Signed-off-by: Guo Ren (Alibaba DAMO Academy) <guoren@kernel.org> > --- > include/linux/maple_tree.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h > index cbbcd18d4186..ff6265b6468b 100644 > --- a/include/linux/maple_tree.h > +++ b/include/linux/maple_tree.h > @@ -24,7 +24,7 @@ > * > * Nodes in the tree point to their parent unless bit 0 is set. > */ > -#if defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) > +#if (BITS_PER_LONG == 64) || defined(BUILD_VDSO32_64) This will break my userspace testing, if you do not update the testing as well. This can be found in tools/testing/radix-tree. Please also look at the Makefile as well since it will generate a build flag for the userspace. This raises other concerns as the code is found with a grep command, so I'm not sure why it was missed and if anything else is missed? If you consider this email to be the (unasked) question about what to do here, then please CC me, the maintainer of the files including the one you are updating here. Thank you, Liam
diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index cbbcd18d4186..ff6265b6468b 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -24,7 +24,7 @@ * * Nodes in the tree point to their parent unless bit 0 is set. */ -#if defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) +#if (BITS_PER_LONG == 64) || defined(BUILD_VDSO32_64) /* 64bit sizes */ #define MAPLE_NODE_SLOTS 31 /* 256 bytes including ->parent */ #define MAPLE_RANGE64_SLOTS 16 /* 256 bytes */