Re: [PATCH] mm: Switch NUMA_BUILD and COMPACTION_BUILD to newIS_ENABLED() syntax

From: Michal Hocko
Date: Thu Aug 11 2011 - 08:51:37 EST


On Wed 10-08-11 17:12:40, Michal Marek wrote:
> Introduced in 3.1-rc1, IS_ENABLED(CONFIG_NUMA) expands to a true value
> iff CONFIG_NUMA is set. This makes it easier to grep for code that
> depends on CONFIG_NUMA.

Same applies to CONFIG_COMPACTION.

> Signed-off-by: Michal Marek <mmarek@xxxxxxx>

I like this.

Acked-by: Michal Hocko <mhocko@xxxxxxx>

> ---
> include/linux/gfp.h | 2 +-
> include/linux/kernel.h | 14 --------------
> mm/page_alloc.c | 17 +++++++++--------
> mm/vmalloc.c | 4 ++--
> mm/vmscan.c | 2 +-
> 5 files changed, 13 insertions(+), 26 deletions(-)
>
[...]
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 6e8ecb6..e052d79 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
[...]
> @@ -2097,7 +2098,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
> * allowed per node queues are empty and that nodes are
> * over allocated.
> */
> - if (NUMA_BUILD && (gfp_mask & GFP_THISNODE) == GFP_THISNODE)
> + if (IS_ENABLED(CONFIG_NUMA) && (gfp_mask & GFP_THISNODE) == GFP_THISNODE)

I gues it makes sense to follow checkpatch here.

> goto nopage;
>
> restart:

--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/