diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 18:52:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 18:52:46 +0100 |
| commit | 66a05d6b47a299b6bdeb645bc2d536109cd800b4 (patch) | |
| tree | 5618a796c153a5f691330f15e334a6924fdc5756 /arch/x86/oprofile/op_model_ppro.c | |
| parent | Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | x86/oprofile: fix Intel cpu family 6 detection (diff) | |
| download | linux-66a05d6b47a299b6bdeb645bc2d536109cd800b4.tar.xz linux-66a05d6b47a299b6bdeb645bc2d536109cd800b4.zip | |
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
Diffstat (limited to 'arch/x86/oprofile/op_model_ppro.c')
| -rw-r--r-- | arch/x86/oprofile/op_model_ppro.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 716d26f0e5d4..e9f80c744cf3 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c @@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs) unsigned int low, high; int i; + if (!reset_value) + return; for (i = 0; i < num_counters; ++i) { if (reset_value[i]) { CTRL_READ(low, high, msrs, i); @@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs) unsigned int low, high; int i; + if (!reset_value) + return; for (i = 0; i < num_counters; ++i) { if (!reset_value[i]) continue; |