From eb6d0c74e526d9a1d8a3e48f9b177fe72392ecc3 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Thu, 20 Feb 2020 15:06:48 -0500 Subject: [PATCH] maple_tree: Fix u64 => unsigned long Incorrect types fixed. This will need to be revisited for different arch and also u16/u32 one day. Signed-off-by: Liam R. Howlett --- include/linux/maple_tree.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 88f4593220eb..eb9ede385c02 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -84,14 +84,14 @@ typedef struct maple_pnode *maple_pnode; // parent node. struct maple_range_64 { struct maple_pnode *parent; void __rcu *slot[MAPLE_RANGE64_SLOTS]; - u64 pivot[MAPLE_RANGE64_SLOTS - 1]; + unsigned long pivot[MAPLE_RANGE64_SLOTS - 1]; }; struct maple_arange_64 { struct maple_pnode *parent; - u64 gap[MAPLE_ARANGE64_SLOTS]; + unsigned long gap[MAPLE_ARANGE64_SLOTS]; void __rcu *slot[MAPLE_ARANGE64_SLOTS]; - u64 pivot[MAPLE_ARANGE64_SLOTS - 1]; + unsigned long pivot[MAPLE_ARANGE64_SLOTS - 1]; }; struct maple_range_32 { @@ -109,7 +109,7 @@ struct maple_range_16 { struct maple_sparse_64 { struct maple_pnode *parent; void __rcu *slot[MAPLE_SPARSE64_SLOTS]; - u64 pivot[MAPLE_SPARSE64_SLOTS]; + unsigned long pivot[MAPLE_SPARSE64_SLOTS]; }; struct maple_sparse_32 { @@ -121,7 +121,7 @@ struct maple_sparse_32 { struct maple_sparse_21 { struct maple_pnode *parent; void __rcu *slot[MAPLE_SPARSE21_SLOTS]; - u64 pivot[(MAPLE_SPARSE21_SLOTS + 2) / 3]; + unsigned long pivot[(MAPLE_SPARSE21_SLOTS + 2) / 3]; }; struct maple_sparse_16 { @@ -133,13 +133,13 @@ struct maple_sparse_16 { struct maple_sparse_9 { struct maple_pnode *parent; void __rcu *slot[MAPLE_SPARSE9_SLOTS]; - u64 pivot[(MAPLE_SPARSE9_SLOTS + 6) / 7]; + unsigned long pivot[(MAPLE_SPARSE9_SLOTS + 6) / 7]; }; struct maple_sparse_6 { struct maple_pnode *parent; void __rcu *slot[MAPLE_SPARSE6_SLOTS]; - u64 pivot; /* Use a bitmap for pivots */ + unsigned long pivot; /* Use a bitmap for pivots */ }; struct maple_node { -- 2.50.1