mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	percpu: don't forget to free the temporary struct pcpu_alloc_info
Unlike the SMP case, the !SMP case does not free the memory for struct pcpu_alloc_info allocated in setup_per_cpu_areas(). And to give it a chance of being reused by the page allocator later, align it to a page boundary just like its size. Signed-off-by: Nicolas Pitre <nico@linaro.org> Acked-by: Dennis Zhou <dennisszhou@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
		
							parent
							
								
									d81fa669e3
								
							
						
					
					
						commit
						438a506180
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -1851,7 +1851,7 @@ struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
 | 
			
		|||
			  __alignof__(ai->groups[0].cpu_map[0]));
 | 
			
		||||
	ai_size = base_size + nr_units * sizeof(ai->groups[0].cpu_map[0]);
 | 
			
		||||
 | 
			
		||||
	ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), 0);
 | 
			
		||||
	ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), PAGE_SIZE);
 | 
			
		||||
	if (!ptr)
 | 
			
		||||
		return NULL;
 | 
			
		||||
	ai = ptr;
 | 
			
		||||
| 
						 | 
				
			
			@ -2714,6 +2714,7 @@ void __init setup_per_cpu_areas(void)
 | 
			
		|||
 | 
			
		||||
	if (pcpu_setup_first_chunk(ai, fc) < 0)
 | 
			
		||||
		panic("Failed to initialize percpu areas.");
 | 
			
		||||
	pcpu_free_alloc_info(ai);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif	/* CONFIG_SMP */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue