diff --git a/[refs] b/[refs] index 2b7f8a4aff7e..28b32bdb8402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffe0d5a575459ffe664b0762130b557f826fcace +refs/heads/master: fb59e72e7e10fd9d31f4e522f1b28254c2cc8a6c diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c index e5c4cbda6026..a64133f8af45 100644 --- a/trunk/mm/percpu.c +++ b/trunk/mm/percpu.c @@ -1347,6 +1347,10 @@ struct pcpu_alloc_info * __init pcpu_build_alloc_info( struct pcpu_alloc_info *ai; unsigned int *cpu_map; + /* this function may be called multiple times */ + memset(group_map, 0, sizeof(group_map)); + memset(group_cnt, 0, sizeof(group_map)); + /* * Determine min_unit_size, alloc_size and max_upa such that * alloc_size is multiple of atom_size and is the smallest