diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2012-01-28 01:38:48 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2012-01-28 01:38:48 +0000 |
| commit | 158c4475c832b60f103b1f612b7ce43674ebd298 (patch) | |
| tree | ac378c7ffed565fd0443ccca68f246c5ed8644b8 /sys/dev/hwpmc/hwpmc_x86.c | |
| parent | a3681f901040ec361bf0b4b5577e54f1f72c66af (diff) | |
| download | src-158c4475c832b60f103b1f612b7ce43674ebd298.tar.gz src-158c4475c832b60f103b1f612b7ce43674ebd298.zip | |
pmc_*_initialize may return NULL if the CPU is not supported, so check
that md is not null before dereferencing it.
PR: kern/156540
Notes
Notes:
svn path=/head/; revision=230636
Diffstat (limited to 'sys/dev/hwpmc/hwpmc_x86.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 8c98983b571d..72ed518f1a2d 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -250,7 +250,7 @@ pmc_md_initialize() return (NULL); /* disallow sampling if we do not have an LAPIC */ - if (!lapic_enable_pmc()) + if (md != NULL && !lapic_enable_pmc()) for (i = 1; i < md->pmd_nclass; i++) md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT; |