On Wed 18-07-18 14:47:20, osalvador@xxxxxxxxxxxxxxxxxx wrote:
> From: Oscar Salvador <osalvador@xxxxxxx>
>
> Moving the #ifdefs out of the function makes it easier to follow.
>
> Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
OK, this makes some sense.
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> mm/page_alloc.c | 50 +++++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 37 insertions(+), 13 deletions(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index e357189cd24a..8a73305f7c55 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -6206,6 +6206,37 @@ static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages,
> return PAGE_ALIGN(pages * sizeof(struct page)) >> PAGE_SHIFT;
> }
>
> +#ifdef CONFIG_NUMA_BALANCING
> +static void pgdat_init_numabalancing(struct pglist_data *pgdat)
> +{
> + spin_lock_init(&pgdat->numabalancing_migrate_lock);
> + pgdat->numabalancing_migrate_nr_pages = 0;
> + pgdat->numabalancing_migrate_next_window = jiffies;
> +}
> +#else
> +static void pgdat_init_numabalancing(struct pglist_data *pgdat) {}
> +#endif
> +
> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> +static void pgdat_init_split_queue(struct pglist_data *pgdat)
> +{
> + spin_lock_init(&pgdat->split_queue_lock);
> + INIT_LIST_HEAD(&pgdat->split_queue);
> + pgdat->split_queue_len = 0;
> +}
> +#else
> +static void pgdat_init_split_queue(struct pglist_data *pgdat) {}
> +#endif
> +
> +#ifdef CONFIG_COMPACTION
> +static void pgdat_init_kcompactd(struct pglist_data *pgdat)
> +{
> + init_waitqueue_head(&pgdat->kcompactd_wait);
> +}
> +#else
> +static void pgdat_init_kcompactd(struct pglist_data *pgdat) {}
> +#endif
> +
> /*
> * Set up the zone data structures:
> * - mark all pages reserved
> @@ -6220,21 +6251,14 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
> int nid = pgdat->node_id;
>
> pgdat_resize_init(pgdat);
> -#ifdef CONFIG_NUMA_BALANCING
> - spin_lock_init(&pgdat->numabalancing_migrate_lock);
> - pgdat->numabalancing_migrate_nr_pages = 0;
> - pgdat->numabalancing_migrate_next_window = jiffies;
> -#endif
> -#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> - spin_lock_init(&pgdat->split_queue_lock);
> - INIT_LIST_HEAD(&pgdat->split_queue);
> - pgdat->split_queue_len = 0;
> -#endif
> +
> + pgdat_init_numabalancing(pgdat);
> + pgdat_init_split_queue(pgdat);
> + pgdat_init_kcompactd(pgdat);
> +
> init_waitqueue_head(&pgdat->kswapd_wait);
> init_waitqueue_head(&pgdat->pfmemalloc_wait);
> -#ifdef CONFIG_COMPACTION
> - init_waitqueue_head(&pgdat->kcompactd_wait);
> -#endif
> +
> pgdat_page_ext_init(pgdat);
> spin_lock_init(&pgdat->lru_lock);
> lruvec_init(node_lruvec(pgdat));
> --
> 2.13.6
>
--
Michal Hocko
SUSE Labs
