diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-07-10 18:15:21 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-07-20 16:43:21 +0200 |
| commit | 11be1a7b54283021777f409aa983ce125945e67c (patch) | |
| tree | 29200e0dc0d614999fb75fbf429519ddded778d3 /arch/x86 | |
| parent | 61d149d5248ad7428801cdede0f5fcc2b90cd61c (diff) | |
x86/oprofile: Add counter reservation check for virtual counters
This patch adds a check for the availability of a counter. A virtual
counter is used only if its physical counter is not reserved.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 5856e61cb09..cb88b1a0bd5 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -435,15 +435,13 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root) struct dentry *dir; char buf[4]; -#ifndef CONFIG_OPROFILE_EVENT_MULTIPLEX /* quick little hack to _not_ expose a counter if it is not * available for use. This should protect userspace app. * NOTE: assumes 1:1 mapping here (that counters are organized * sequentially in their struct assignment). */ - if (unlikely(!avail_to_resrv_perfctr_nmi_bit(i))) + if (!avail_to_resrv_perfctr_nmi_bit(op_x86_virt_to_phys(i))) continue; -#endif /* CONFIG_OPROFILE_EVENT_MULTIPLEX */ snprintf(buf, sizeof(buf), "%d", i); dir = oprofilefs_mkdir(sb, root, buf); |