Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da0130a5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "lowmemorykiller: fix cma accounting""

parents 12bf3142 b21c7a67

drivers/staging/android/lowmemorykiller.c

+2 −7
Original line number Diff line number Diff line
@@ -264,13 +264,8 @@ static DEFINE_MUTEX(scan_mutex); 


static int can_use_cma_pages(gfp_t gfp_mask)

{

	int mtype = gfpflags_to_migratetype(gfp_mask);



	/*

	 * Assumes that all types of movable pages can be

	 * served by cma. Fix this if that changes.

	 */

	if (mtype == MIGRATE_MOVABLE)

	if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE &&

	    (gfp_mask & __GFP_CMA))

		return 1;



	return 0;

include/linux/mmzone.h

+0 −7
Original line number Diff line number Diff line
@@ -66,13 +66,6 @@ enum migratetype { 


/* In mm/page_alloc.c; keep in sync also with show_migration_types() there */

extern char * const migratetype_names[MIGRATE_TYPES];

/*

 * Returns a list which contains the migrate types on to which

 * an allocation falls back when the free list for the migrate

 * type mtype is depleted.

 * The end of the list is delimited by the type MIGRATE_TYPES.

 */

extern int *get_migratetype_fallbacks(int mtype);



#ifdef CONFIG_CMA

#  define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)

mm/page_alloc.c

+0 −5
Original line number Diff line number Diff line
@@ -1855,11 +1855,6 @@ static int fallbacks[MIGRATE_TYPES][4] = { 
#endif

};



int *get_migratetype_fallbacks(int mtype)

{

	return fallbacks[mtype];

}



#ifdef CONFIG_CMA

static struct page *__rmqueue_cma_fallback(struct zone *zone,

					unsigned int order)