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

Commit d84da3f9 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD 



We don't need custom COMPACTION_BUILD anymore, since we have handy
IS_ENABLED().

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5adfffc

include/linux/kernel.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -687,13 +687,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } 
/* Trap pasters of __FUNCTION__ at compile-time */

/* Trap pasters of __FUNCTION__ at compile-time */

#define __FUNCTION__ (__func__)

#define __FUNCTION__ (__func__)





/* This helps us avoid #ifdef CONFIG_COMPACTION */

#ifdef CONFIG_COMPACTION

#define COMPACTION_BUILD 1

#else

#define COMPACTION_BUILD 0

#endif



/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */

/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */

#ifdef CONFIG_SYMBOL_PREFIX

#ifdef CONFIG_SYMBOL_PREFIX

#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX

#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX

mm/vmscan.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -1752,7 +1752,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, 
/* Use reclaim/compaction for costly allocs or under memory pressure */

/* Use reclaim/compaction for costly allocs or under memory pressure */

static bool in_reclaim_compaction(struct scan_control *sc)

static bool in_reclaim_compaction(struct scan_control *sc)

{

{

	if (COMPACTION_BUILD && sc->order &&

	if (IS_ENABLED(CONFIG_COMPACTION) && sc->order &&

			(sc->order > PAGE_ALLOC_COSTLY_ORDER ||

			(sc->order > PAGE_ALLOC_COSTLY_ORDER ||

			 sc->priority < DEF_PRIORITY - 2))

			 sc->priority < DEF_PRIORITY - 2))

		return true;

		return true;
@@ -2005,7 +2005,7 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc) 
			if (zone->all_unreclaimable &&

			if (zone->all_unreclaimable &&

					sc->priority != DEF_PRIORITY)

					sc->priority != DEF_PRIORITY)

				continue;	/* Let kswapd poll it */

				continue;	/* Let kswapd poll it */

			if (COMPACTION_BUILD) {

			if (IS_ENABLED(CONFIG_COMPACTION)) {

				/*

				/*

				 * If we already have plenty of memory free for

				 * If we already have plenty of memory free for

				 * compaction in this zone, don't free any more.

				 * compaction in this zone, don't free any more.
@@ -2421,7 +2421,8 @@ static bool zone_balanced(struct zone *zone, int order, 
				    balance_gap, classzone_idx, 0))

				    balance_gap, classzone_idx, 0))

		return false;

		return false;





	if (COMPACTION_BUILD && order && !compaction_suitable(zone, order))

	if (IS_ENABLED(CONFIG_COMPACTION) && order &&

	    !compaction_suitable(zone, order))

		return false;

		return false;





	return true;

	return true;
@@ -2684,7 +2685,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, 
			 * Do not reclaim more than needed for compaction.

			 * Do not reclaim more than needed for compaction.

			 */

			 */

			testorder = order;

			testorder = order;

			if (COMPACTION_BUILD && order &&

			if (IS_ENABLED(CONFIG_COMPACTION) && order &&

					compaction_suitable(zone, order) !=

					compaction_suitable(zone, order) !=

						COMPACT_SKIPPED)

						COMPACT_SKIPPED)

				testorder = 0;

				testorder = 0;