forked from mirrors/linux
		
	oprofile: don't call arch exit code from init code on failure
oprofile_init calls oprofile_arch_init to initialise the architecture-specific backend code. If this backend code returns failure, oprofile_arch_exit is called immediately, making it difficult to allocate and free resources correctly. This patch removes the oprofile_arch_exit call from oprofile_init, meaning that all architectures must ensure that oprofile_arch_init cleans up any mess it's made before returning an error. As far as I can tell, this only affects the code for ARM. Cc: Robert Richter <robert.richter@amd.com> Cc: Matt Fleming <matt@console-pimps.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
		
							parent
							
								
									2bfc96a127
								
							
						
					
					
						commit
						979048e1f2
					
				
					 1 changed files with 2 additions and 9 deletions
				
			
		| 
						 | 
					@ -257,16 +257,9 @@ static int __init oprofile_init(void)
 | 
				
			||||||
		printk(KERN_INFO "oprofile: using timer interrupt.\n");
 | 
							printk(KERN_INFO "oprofile: using timer interrupt.\n");
 | 
				
			||||||
		err = oprofile_timer_init(&oprofile_ops);
 | 
							err = oprofile_timer_init(&oprofile_ops);
 | 
				
			||||||
		if (err)
 | 
							if (err)
 | 
				
			||||||
			goto out_arch;
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	err = oprofilefs_register();
 | 
					 | 
				
			||||||
	if (err)
 | 
					 | 
				
			||||||
		goto out_arch;
 | 
					 | 
				
			||||||
	return 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
out_arch:
 | 
					 | 
				
			||||||
	oprofile_arch_exit();
 | 
					 | 
				
			||||||
			return err;
 | 
								return err;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return oprofilefs_register();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue