Revert "modules: use si_mem_available() when possible"
This method produced too optimistic free memory value, which in result
led to oom killer activation. This patch restores more conservative
free memory calculation method.
This reverts commit 1e9b7a4262.
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
			
			
This commit is contained in:
		| @@ -9,39 +9,30 @@ | ||||
| check() { | ||||
| 	cur_name=$(basename $2) | ||||
| 	config_file_path=$1 | ||||
| 	if compile_module $cur_name "si_mem_available()" "linux/mm.h" | ||||
| 	if compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h" | ||||
| 	then | ||||
| 		echo $cur_name "1" >> $config_file_path | ||||
|  | ||||
| 	elif compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h" | ||||
| 	then | ||||
| 		echo $cur_name "2" >> $config_file_path | ||||
| 	elif compile_module $cur_name "global_page_state(1)" "linux/mm.h" | ||||
| 	then | ||||
| 		echo $cur_name "3" >> $config_file_path | ||||
| 	else | ||||
| 	    echo $cur_name "X" >> $config_file_path | ||||
| 	fi | ||||
| 		echo $cur_name "2" >> $config_file_path | ||||
|     else | ||||
|         echo $cur_name "X" >> $config_file_path | ||||
|     fi | ||||
| } | ||||
|  | ||||
| apply() { | ||||
|     case "$1" in | ||||
|     "1") | ||||
| 		add_function " | ||||
| 	static inline unsigned long cas_get_free_mem(void) | ||||
| 		{	return si_mem_available() << PAGE_SHIFT; | ||||
| 	static inline unsigned long cas_global_zone_page_state(enum zone_stat_item item) | ||||
| 		{ | ||||
| 			return global_zone_page_state(item); | ||||
| 		}" ;; | ||||
|     "2") | ||||
| 		add_function " | ||||
| 	static inline unsigned long cas_get_free_mem(void) | ||||
| 	static inline unsigned long cas_global_zone_page_state(enum zone_stat_item item) | ||||
| 		{ | ||||
| 			return global_zone_page_state(NR_FREE_PAGES) << PAGE_SHIFT; | ||||
| 		}" ;; | ||||
|     "3") | ||||
| 		add_function " | ||||
| 	static inline unsigned long cas_get_free_mem(void) | ||||
| 		{ | ||||
| 			return global_page_state(NR_FREE_PAGES) << PAGE_SHIFT; | ||||
| 			return global_page_state(item); | ||||
| 		}" ;; | ||||
|     *) | ||||
|         exit 1 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Robert Baldyga
					Robert Baldyga