From: Rusty Russell Subject: page_alloc: use cpumask_var_t. The BSS trick works, but it still wastes space. Especially since there's a nice fallback in the case where we fail to allocate a temporary cpumask. Signed-off-by: Rusty Russell --- mm/page_alloc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a712fb9..8a722a0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1174,12 +1174,12 @@ void drain_all_pages(void) int cpu; struct per_cpu_pageset *pcp; struct zone *zone; + cpumask_var_t cpus_with_pcps; - /* - * Allocate in the BSS so we wont require allocation in - * direct reclaim path for CONFIG_CPUMASK_OFFSTACK=y - */ - static cpumask_t cpus_with_pcps; + if (!zalloc_cpumask_var(&cpus_with_pcps, GFP_KERNEL)) { + on_each_cpu(drain_local_pages, NULL, 1); + return; + } /* * We don't care about racing with CPU hotplug event @@ -1197,11 +1197,10 @@ void drain_all_pages(void) } } if (has_pcps) - cpumask_set_cpu(cpu, &cpus_with_pcps); - else - cpumask_clear_cpu(cpu, &cpus_with_pcps); + cpumask_set_cpu(cpu, cpus_with_pcps); } - on_each_cpu_mask(&cpus_with_pcps, drain_local_pages, NULL, 1); + on_each_cpu_mask(cpus_with_pcps, drain_local_pages, NULL, 1); + free_cpumask_var(cpus_with_pcps); } #ifdef CONFIG_HIBERNATION