diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
| commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
| tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /arch/mips/oprofile/common.c | |
| parent | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (diff) | |
| parent | 330ab71619bacc4d4494227a6cfc9b7f5500403d (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/oprofile/common.c')
| -rw-r--r-- | arch/mips/oprofile/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c index 935dd851f48..f2b4862aaae 100644 --- a/arch/mips/oprofile/common.c +++ b/arch/mips/oprofile/common.c @@ -27,7 +27,7 @@ static int op_mips_setup(void) model->reg_setup(ctr); /* Configure the registers on all cpus. */ - on_each_cpu(model->cpu_setup, 0, 0, 1); + on_each_cpu(model->cpu_setup, NULL, 0, 1); return 0; } @@ -114,5 +114,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) void oprofile_arch_exit(void) { - model->exit(); + if (model) + model->exit(); } |