diff options
Diffstat (limited to 'tools/testing/radix-tree/maple.c')
| -rw-r--r-- | tools/testing/radix-tree/maple.c | 160 | 
1 files changed, 82 insertions, 78 deletions
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c index 9286d3baa12d..03539d86cdf0 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -14,6 +14,7 @@  #include "test.h"  #include <stdlib.h>  #include <time.h> +#include "linux/init.h"  #define module_init(x)  #define module_exit(x) @@ -22,7 +23,6 @@  #define dump_stack()	assert(0)  #include "../../../lib/maple_tree.c" -#undef CONFIG_DEBUG_MAPLE_TREE  #include "../../../lib/test_maple_tree.c"  #define RCU_RANGE_COUNT 1000 @@ -81,7 +81,7 @@ static void check_mas_alloc_node_count(struct ma_state *mas)   * check_new_node() - Check the creation of new nodes and error path   * verification.   */ -static noinline void check_new_node(struct maple_tree *mt) +static noinline void __init check_new_node(struct maple_tree *mt)  {  	struct maple_node *mn, *mn2, *mn3; @@ -455,7 +455,7 @@ static noinline void check_new_node(struct maple_tree *mt)  /*   * Check erasing including RCU.   */ -static noinline void check_erase(struct maple_tree *mt, unsigned long index, +static noinline void __init check_erase(struct maple_tree *mt, unsigned long index,  		void *ptr)  {  	MT_BUG_ON(mt, mtree_test_erase(mt, index) != ptr); @@ -465,24 +465,24 @@ static noinline void check_erase(struct maple_tree *mt, unsigned long index,  #define erase_check_insert(mt, i) check_insert(mt, set[i], entry[i%2])  #define erase_check_erase(mt, i) check_erase(mt, set[i], entry[i%2]) -static noinline void check_erase_testset(struct maple_tree *mt) +static noinline void __init check_erase_testset(struct maple_tree *mt)  { -	unsigned long set[] = { 5015, 5014, 5017, 25, 1000, -				1001, 1002, 1003, 1005, 0, -				6003, 6002, 6008, 6012, 6015, -				7003, 7002, 7008, 7012, 7015, -				8003, 8002, 8008, 8012, 8015, -				9003, 9002, 9008, 9012, 9015, -				10003, 10002, 10008, 10012, 10015, -				11003, 11002, 11008, 11012, 11015, -				12003, 12002, 12008, 12012, 12015, -				13003, 13002, 13008, 13012, 13015, -				14003, 14002, 14008, 14012, 14015, -				15003, 15002, 15008, 15012, 15015, -			      }; +	static const unsigned long set[] = { 5015, 5014, 5017, 25, 1000, +					     1001, 1002, 1003, 1005, 0, +					     6003, 6002, 6008, 6012, 6015, +					     7003, 7002, 7008, 7012, 7015, +					     8003, 8002, 8008, 8012, 8015, +					     9003, 9002, 9008, 9012, 9015, +					     10003, 10002, 10008, 10012, 10015, +					     11003, 11002, 11008, 11012, 11015, +					     12003, 12002, 12008, 12012, 12015, +					     13003, 13002, 13008, 13012, 13015, +					     14003, 14002, 14008, 14012, 14015, +					     15003, 15002, 15008, 15012, 15015, +					   }; -	void *ptr = &set; +	void *ptr = &check_erase_testset;  	void *entry[2] = { ptr, mt };  	void *root_node; @@ -739,7 +739,7 @@ static noinline void check_erase_testset(struct maple_tree *mt)  int mas_ce2_over_count(struct ma_state *mas_start, struct ma_state *mas_end,  		      void *s_entry, unsigned long s_min,  		      void *e_entry, unsigned long e_max, -		      unsigned long *set, int i, bool null_entry) +		      const unsigned long *set, int i, bool null_entry)  {  	int count = 0, span = 0;  	unsigned long retry = 0; @@ -969,8 +969,8 @@ retry:  }  #if defined(CONFIG_64BIT) -static noinline void check_erase2_testset(struct maple_tree *mt, -		unsigned long *set, unsigned long size) +static noinline void __init check_erase2_testset(struct maple_tree *mt, +		const unsigned long *set, unsigned long size)  {  	int entry_count = 0;  	int check = 0; @@ -1054,7 +1054,7 @@ static noinline void check_erase2_testset(struct maple_tree *mt,  		if (entry_count)  			MT_BUG_ON(mt, !mt_height(mt));  #if check_erase2_debug > 1 -		mt_dump(mt); +		mt_dump(mt, mt_dump_hex);  #endif  #if check_erase2_debug  		pr_err("Done\n"); @@ -1085,7 +1085,7 @@ static noinline void check_erase2_testset(struct maple_tree *mt,  		mas_for_each(&mas, foo, ULONG_MAX) {  			if (xa_is_zero(foo)) {  				if (addr == mas.index) { -					mt_dump(mas.tree); +					mt_dump(mas.tree, mt_dump_hex);  					pr_err("retry failed %lu - %lu\n",  						mas.index, mas.last);  					MT_BUG_ON(mt, 1); @@ -1114,11 +1114,11 @@ static noinline void check_erase2_testset(struct maple_tree *mt,  /* These tests were pulled from KVM tree modifications which failed. */ -static noinline void check_erase2_sets(struct maple_tree *mt) +static noinline void __init check_erase2_sets(struct maple_tree *mt)  {  	void *entry;  	unsigned long start = 0; -	unsigned long set[] = { +	static const unsigned long set[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140721266458624, 140737488351231,  ERASE, 140721266458624, 140737488351231, @@ -1136,7 +1136,7 @@ ERASE, 140253902692352, 140253902864383,  STORE, 140253902692352, 140253902696447,  STORE, 140253902696448, 140253902864383,  		}; -	unsigned long set2[] = { +	static const unsigned long set2[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140735933583360, 140737488351231,  ERASE, 140735933583360, 140737488351231, @@ -1160,7 +1160,7 @@ STORE, 140277094813696, 140277094821887,  STORE, 140277094821888, 140277094825983,  STORE, 140735933906944, 140735933911039,  	}; -	unsigned long set3[] = { +	static const unsigned long set3[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140735790264320, 140737488351231,  ERASE, 140735790264320, 140737488351231, @@ -1203,7 +1203,7 @@ STORE, 47135835840512, 47135835885567,  STORE, 47135835885568, 47135835893759,  	}; -	unsigned long set4[] = { +	static const unsigned long set4[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140728251703296, 140737488351231,  ERASE, 140728251703296, 140737488351231, @@ -1224,7 +1224,7 @@ ERASE, 47646523277312, 47646523445247,  STORE, 47646523277312, 47646523400191,  	}; -	unsigned long set5[] = { +	static const unsigned long set5[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140726874062848, 140737488351231,  ERASE, 140726874062848, 140737488351231, @@ -1357,7 +1357,7 @@ STORE, 47884791619584, 47884791623679,  STORE, 47884791623680, 47884791627775,  	}; -	unsigned long set6[] = { +	static const unsigned long set6[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140722999021568, 140737488351231,  ERASE, 140722999021568, 140737488351231, @@ -1489,7 +1489,7 @@ ERASE, 47430432014336, 47430432022527,  STORE, 47430432014336, 47430432018431,  STORE, 47430432018432, 47430432022527,  	}; -	unsigned long set7[] = { +	static const unsigned long set7[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140729808330752, 140737488351231,  ERASE, 140729808330752, 140737488351231, @@ -1621,7 +1621,7 @@ ERASE, 47439987130368, 47439987138559,  STORE, 47439987130368, 47439987134463,  STORE, 47439987134464, 47439987138559,  	}; -	unsigned long set8[] = { +	static const unsigned long set8[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140722482974720, 140737488351231,  ERASE, 140722482974720, 140737488351231, @@ -1754,7 +1754,7 @@ STORE, 47708488638464, 47708488642559,  STORE, 47708488642560, 47708488646655,  	}; -	unsigned long set9[] = { +	static const unsigned long set9[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140736427839488, 140737488351231,  ERASE, 140736427839488, 140736427839488, @@ -5620,7 +5620,7 @@ ERASE, 47906195480576, 47906195480576,  STORE, 94641242615808, 94641242750975,  	}; -	unsigned long set10[] = { +	static const unsigned long set10[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140736427839488, 140737488351231,  ERASE, 140736427839488, 140736427839488, @@ -9484,7 +9484,7 @@ STORE, 139726599680000, 139726599684095,  ERASE, 47906195480576, 47906195480576,  STORE, 94641242615808, 94641242750975,  	}; -	unsigned long set11[] = { +	static const unsigned long set11[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140732658499584, 140737488351231,  ERASE, 140732658499584, 140732658499584, @@ -9510,7 +9510,7 @@ STORE, 140732658565120, 140732658569215,  STORE, 140732658552832, 140732658565119,  	}; -	unsigned long set12[] = { /* contains 12 values. */ +	static const unsigned long set12[] = { /* contains 12 values. */  STORE, 140737488347136, 140737488351231,  STORE, 140732658499584, 140737488351231,  ERASE, 140732658499584, 140732658499584, @@ -9537,7 +9537,7 @@ STORE, 140732658552832, 140732658565119,  STORE, 140014592741375, 140014592741375, /* contrived */  STORE, 140014592733184, 140014592741376, /* creates first entry retry. */  	}; -	unsigned long set13[] = { +	static const unsigned long set13[] = {  STORE, 140373516247040, 140373516251135,/*: ffffa2e7b0e10d80 */  STORE, 140373516251136, 140373516255231,/*: ffffa2e7b1195d80 */  STORE, 140373516255232, 140373516443647,/*: ffffa2e7b0e109c0 */ @@ -9550,7 +9550,7 @@ STORE, 140373518684160, 140373518688254,/*: ffffa2e7b05fec00 */  STORE, 140373518688256, 140373518692351,/*: ffffa2e7bfbdcd80 */  STORE, 140373518692352, 140373518696447,/*: ffffa2e7b0749e40 */  	}; -	unsigned long set14[] = { +	static const unsigned long set14[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140731667996672, 140737488351231,  SNULL, 140731668000767, 140737488351231, @@ -9834,7 +9834,7 @@ SNULL, 139826136543232, 139826136809471,  STORE, 139826136809472, 139826136842239,  STORE, 139826136543232, 139826136809471,  	}; -	unsigned long set15[] = { +	static const unsigned long set15[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140722061451264, 140737488351231,  SNULL, 140722061455359, 140737488351231, @@ -10119,7 +10119,7 @@ STORE, 139906808958976, 139906808991743,  STORE, 139906808692736, 139906808958975,  	}; -	unsigned long set16[] = { +	static const unsigned long set16[] = {  STORE, 94174808662016, 94174809321471,  STORE, 94174811414528, 94174811426815,  STORE, 94174811426816, 94174811430911, @@ -10330,7 +10330,7 @@ STORE, 139921865613312, 139921865617407,  STORE, 139921865547776, 139921865564159,  	}; -	unsigned long set17[] = { +	static const unsigned long set17[] = {  STORE, 94397057224704, 94397057646591,  STORE, 94397057650688, 94397057691647,  STORE, 94397057691648, 94397057695743, @@ -10392,7 +10392,7 @@ STORE, 140720477511680, 140720477646847,  STORE, 140720478302208, 140720478314495,  STORE, 140720478314496, 140720478318591,  	}; -	unsigned long set18[] = { +	static const unsigned long set18[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140724953673728, 140737488351231,  SNULL, 140724953677823, 140737488351231, @@ -10425,7 +10425,7 @@ STORE, 140222970597376, 140222970605567,  ERASE, 140222970597376, 140222970605567,  STORE, 140222970597376, 140222970605567,  	}; -	unsigned long set19[] = { +	static const unsigned long set19[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140725182459904, 140737488351231,  SNULL, 140725182463999, 140737488351231, @@ -10694,7 +10694,7 @@ STORE, 140656836775936, 140656836780031,  STORE, 140656787476480, 140656791920639,  ERASE, 140656774639616, 140656779083775,  	}; -	unsigned long set20[] = { +	static const unsigned long set20[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140735952392192, 140737488351231,  SNULL, 140735952396287, 140737488351231, @@ -10850,7 +10850,7 @@ STORE, 140590386819072, 140590386823167,  STORE, 140590386823168, 140590386827263,  SNULL, 140590376591359, 140590376595455,  	}; -	unsigned long set21[] = { +	static const unsigned long set21[] = {  STORE, 93874710941696, 93874711363583,  STORE, 93874711367680, 93874711408639,  STORE, 93874711408640, 93874711412735, @@ -10920,7 +10920,7 @@ ERASE, 140708393312256, 140708393316351,  ERASE, 140708393308160, 140708393312255,  ERASE, 140708393291776, 140708393308159,  	}; -	unsigned long set22[] = { +	static const unsigned long set22[] = {  STORE, 93951397134336, 93951397183487,  STORE, 93951397183488, 93951397728255,  STORE, 93951397728256, 93951397826559, @@ -11047,7 +11047,7 @@ STORE, 140551361253376, 140551361519615,  ERASE, 140551361253376, 140551361519615,  	}; -	unsigned long set23[] = { +	static const unsigned long set23[] = {  STORE, 94014447943680, 94014448156671,  STORE, 94014450253824, 94014450257919,  STORE, 94014450257920, 94014450266111, @@ -14371,7 +14371,7 @@ SNULL, 140175956627455, 140175985139711,  STORE, 140175927242752, 140175956627455,  STORE, 140175956627456, 140175985139711,  	}; -	unsigned long set24[] = { +	static const unsigned long set24[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140735281639424, 140737488351231,  SNULL, 140735281643519, 140737488351231, @@ -15533,7 +15533,7 @@ ERASE, 139635393024000, 139635401412607,  ERASE, 139635384627200, 139635384631295,  ERASE, 139635384631296, 139635393019903,  	}; -	unsigned long set25[] = { +	static const unsigned long set25[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140737488343040, 140737488351231,  STORE, 140722547441664, 140737488351231, @@ -22321,7 +22321,7 @@ STORE, 140249652703232, 140249682087935,  STORE, 140249682087936, 140249710600191,  	}; -	unsigned long set26[] = { +	static const unsigned long set26[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140729464770560, 140737488351231,  SNULL, 140729464774655, 140737488351231, @@ -22345,7 +22345,7 @@ ERASE, 140109040951296, 140109040959487,  STORE, 140109040955392, 140109040959487,  ERASE, 140109040955392, 140109040959487,  	}; -	unsigned long set27[] = { +	static const unsigned long set27[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140726128070656, 140737488351231,  SNULL, 140726128074751, 140737488351231, @@ -22741,7 +22741,7 @@ STORE, 140415509696512, 140415535910911,  ERASE, 140415537422336, 140415562588159,  STORE, 140415482433536, 140415509696511,  	}; -	unsigned long set28[] = { +	static const unsigned long set28[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140722475622400, 140737488351231,  SNULL, 140722475626495, 140737488351231, @@ -22809,7 +22809,7 @@ STORE, 139918413348864, 139918413352959,  ERASE, 139918413316096, 139918413344767,  STORE, 93865848528896, 93865848664063,  	}; -	unsigned long set29[] = { +	static const unsigned long set29[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140734467944448, 140737488351231,  SNULL, 140734467948543, 140737488351231, @@ -23684,7 +23684,7 @@ ERASE, 140143079972864, 140143088361471,  ERASE, 140143205793792, 140143205797887,  ERASE, 140143205797888, 140143214186495,  	}; -	unsigned long set30[] = { +	static const unsigned long set30[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140733436743680, 140737488351231,  SNULL, 140733436747775, 140737488351231, @@ -24566,7 +24566,7 @@ ERASE, 140165225893888, 140165225897983,  ERASE, 140165225897984, 140165234286591,  ERASE, 140165058105344, 140165058109439,  	}; -	unsigned long set31[] = { +	static const unsigned long set31[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140730890784768, 140737488351231,  SNULL, 140730890788863, 140737488351231, @@ -25379,7 +25379,7 @@ ERASE, 140623906590720, 140623914979327,  ERASE, 140622950277120, 140622950281215,  ERASE, 140622950281216, 140622958669823,  	}; -	unsigned long set32[] = { +	static const unsigned long set32[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140731244212224, 140737488351231,  SNULL, 140731244216319, 140737488351231, @@ -26175,7 +26175,7 @@ ERASE, 140400417288192, 140400425676799,  ERASE, 140400283066368, 140400283070463,  ERASE, 140400283070464, 140400291459071,  	}; -	unsigned long set33[] = { +	static const unsigned long set33[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140734562918400, 140737488351231,  SNULL, 140734562922495, 140737488351231, @@ -26317,7 +26317,7 @@ STORE, 140582961786880, 140583003750399,  ERASE, 140582961786880, 140583003750399,  	}; -	unsigned long set34[] = { +	static const unsigned long set34[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140731327180800, 140737488351231,  SNULL, 140731327184895, 140737488351231, @@ -27198,7 +27198,7 @@ ERASE, 140012522094592, 140012530483199,  ERASE, 140012033142784, 140012033146879,  ERASE, 140012033146880, 140012041535487,  	}; -	unsigned long set35[] = { +	static const unsigned long set35[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140730536939520, 140737488351231,  SNULL, 140730536943615, 140737488351231, @@ -27955,7 +27955,7 @@ ERASE, 140474471936000, 140474480324607,  ERASE, 140474396430336, 140474396434431,  ERASE, 140474396434432, 140474404823039,  	}; -	unsigned long set36[] = { +	static const unsigned long set36[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140723893125120, 140737488351231,  SNULL, 140723893129215, 140737488351231, @@ -28816,7 +28816,7 @@ ERASE, 140121890357248, 140121898745855,  ERASE, 140121269587968, 140121269592063,  ERASE, 140121269592064, 140121277980671,  	}; -	unsigned long set37[] = { +	static const unsigned long set37[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140722404016128, 140737488351231,  SNULL, 140722404020223, 140737488351231, @@ -28942,7 +28942,7 @@ STORE, 139759821246464, 139759888355327,  ERASE, 139759821246464, 139759888355327,  ERASE, 139759888355328, 139759955464191,  	}; -	unsigned long set38[] = { +	static const unsigned long set38[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140730666221568, 140737488351231,  SNULL, 140730666225663, 140737488351231, @@ -29752,7 +29752,7 @@ ERASE, 140613504712704, 140613504716799,  ERASE, 140613504716800, 140613513105407,  	}; -	unsigned long set39[] = { +	static const unsigned long set39[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140736271417344, 140737488351231,  SNULL, 140736271421439, 140737488351231, @@ -30124,7 +30124,7 @@ STORE, 140325364428800, 140325372821503,  STORE, 140325356036096, 140325364428799,  SNULL, 140325364432895, 140325372821503,  	}; -	unsigned long set40[] = { +	static const unsigned long set40[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140734309167104, 140737488351231,  SNULL, 140734309171199, 140737488351231, @@ -30875,7 +30875,7 @@ ERASE, 140320289300480, 140320289304575,  ERASE, 140320289304576, 140320297693183,  ERASE, 140320163409920, 140320163414015,  	}; -	unsigned long set41[] = { +	static const unsigned long set41[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140728157171712, 140737488351231,  SNULL, 140728157175807, 140737488351231, @@ -31185,7 +31185,7 @@ STORE, 94376135090176, 94376135094271,  STORE, 94376135094272, 94376135098367,  SNULL, 94376135094272, 94377208836095,  	}; -	unsigned long set42[] = { +	static const unsigned long set42[] = {  STORE, 314572800, 1388314623,  STORE, 1462157312, 1462169599,  STORE, 1462169600, 1462185983, @@ -33862,7 +33862,7 @@ SNULL, 3798999040, 3799101439,   */  	}; -	unsigned long set43[] = { +	static const unsigned long set43[] = {  STORE, 140737488347136, 140737488351231,  STORE, 140734187720704, 140737488351231,  SNULL, 140734187724800, 140737488351231, @@ -34513,7 +34513,7 @@ static void *rcu_reader_rev(void *ptr)  			if (mas.index != r_start) {  				alt = xa_mk_value(index + i * 2 + 1 +  						  RCU_RANGE_COUNT); -				mt_dump(test->mt); +				mt_dump(test->mt, mt_dump_dec);  				printk("Error: %lu-%lu %p != %lu-%lu %p %p line %d i %d\n",  				       mas.index, mas.last, entry,  				       r_start, r_end, expected, alt, @@ -34996,7 +34996,7 @@ void run_check_rcu_slowread(struct maple_tree *mt, struct rcu_test_struct *vals)  	MT_BUG_ON(mt, !vals->seen_entry3);  	MT_BUG_ON(mt, !vals->seen_both);  } -static noinline void check_rcu_simulated(struct maple_tree *mt) +static noinline void __init check_rcu_simulated(struct maple_tree *mt)  {  	unsigned long i, nr_entries = 1000;  	unsigned long target = 4320; @@ -35157,7 +35157,7 @@ static noinline void check_rcu_simulated(struct maple_tree *mt)  	rcu_unregister_thread();  } -static noinline void check_rcu_threaded(struct maple_tree *mt) +static noinline void __init check_rcu_threaded(struct maple_tree *mt)  {  	unsigned long i, nr_entries = 1000;  	struct rcu_test_struct vals; @@ -35259,6 +35259,7 @@ static void mas_dfs_preorder(struct ma_state *mas)  	struct maple_enode *prev;  	unsigned char end, slot = 0; +	unsigned long *pivots;  	if (mas->node == MAS_START) {  		mas_start(mas); @@ -35291,6 +35292,9 @@ walk_up:  		mas_ascend(mas);  		goto walk_up;  	} +	pivots = ma_pivots(mte_to_node(prev), mte_node_type(prev)); +	mas->max = mas_safe_pivot(mas, pivots, slot, mte_node_type(prev)); +	mas->min = mas_safe_min(mas, pivots, slot);  	return;  done: @@ -35366,7 +35370,7 @@ static void check_dfs_preorder(struct maple_tree *mt)  /* End of depth first search tests */  /* Preallocation testing */ -static noinline void check_prealloc(struct maple_tree *mt) +static noinline void __init check_prealloc(struct maple_tree *mt)  {  	unsigned long i, max = 100;  	unsigned long allocated; @@ -35494,7 +35498,7 @@ static noinline void check_prealloc(struct maple_tree *mt)  /* End of preallocation testing */  /* Spanning writes, writes that span nodes and layers of the tree */ -static noinline void check_spanning_write(struct maple_tree *mt) +static noinline void __init check_spanning_write(struct maple_tree *mt)  {  	unsigned long i, max = 5000;  	MA_STATE(mas, mt, 1200, 2380); @@ -35662,7 +35666,7 @@ static noinline void check_spanning_write(struct maple_tree *mt)  /* End of spanning write testing */  /* Writes to a NULL area that are adjacent to other NULLs */ -static noinline void check_null_expand(struct maple_tree *mt) +static noinline void __init check_null_expand(struct maple_tree *mt)  {  	unsigned long i, max = 100;  	unsigned char data_end; @@ -35723,7 +35727,7 @@ static noinline void check_null_expand(struct maple_tree *mt)  /* End of NULL area expansions */  /* Checking for no memory is best done outside the kernel */ -static noinline void check_nomem(struct maple_tree *mt) +static noinline void __init check_nomem(struct maple_tree *mt)  {  	MA_STATE(ms, mt, 1, 1); @@ -35758,7 +35762,7 @@ static noinline void check_nomem(struct maple_tree *mt)  	mtree_destroy(mt);  } -static noinline void check_locky(struct maple_tree *mt) +static noinline void __init check_locky(struct maple_tree *mt)  {  	MA_STATE(ms, mt, 2, 2);  	MA_STATE(reader, mt, 2, 2); @@ -35780,10 +35784,10 @@ void farmer_tests(void)  	struct maple_node *node;  	DEFINE_MTREE(tree); -	mt_dump(&tree); +	mt_dump(&tree, mt_dump_dec);  	tree.ma_root = xa_mk_value(0); -	mt_dump(&tree); +	mt_dump(&tree, mt_dump_dec);  	node = mt_alloc_one(GFP_KERNEL);  	node->parent = (void *)((unsigned long)(&tree) | 1); @@ -35793,7 +35797,7 @@ void farmer_tests(void)  	node->mr64.pivot[1] = 1;  	node->mr64.pivot[2] = 0;  	tree.ma_root = mt_mk_node(node, maple_leaf_64); -	mt_dump(&tree); +	mt_dump(&tree, mt_dump_dec);  	node->parent = ma_parent_ptr(node);  	ma_free_rcu(node);  | 
