Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 182410
b: refs/heads/master
c: 502568d
h: refs/heads/master
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jan 29, 2010
1 parent 102b6df commit 5c266c9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8113070d6639d2245c6c79afb8df42cedab30540
refs/heads/master: 502568d563bcc37ac505a83341c0c95b88c015a8
29 changes: 19 additions & 10 deletions trunk/arch/x86/kernel/cpu/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2606,29 +2606,38 @@ static const struct pmu pmu = {
static int validate_group(struct perf_event *event)
{
struct perf_event *leader = event->group_leader;
struct cpu_hw_events fake_cpuc;
int n;
struct cpu_hw_events *fake_cpuc;
int ret, n;

memset(&fake_cpuc, 0, sizeof(fake_cpuc));
ret = -ENOMEM;
fake_cpuc = kmalloc(sizeof(*fake_cpuc), GFP_KERNEL | __GFP_ZERO);
if (!fake_cpuc)
goto out;

/*
* the event is not yet connected with its
* siblings therefore we must first collect
* existing siblings, then add the new event
* before we can simulate the scheduling
*/
n = collect_events(&fake_cpuc, leader, true);
ret = -ENOSPC;
n = collect_events(fake_cpuc, leader, true);
if (n < 0)
return -ENOSPC;
goto out_free;

fake_cpuc.n_events = n;
n = collect_events(&fake_cpuc, event, false);
fake_cpuc->n_events = n;
n = collect_events(fake_cpuc, event, false);
if (n < 0)
return -ENOSPC;
goto out_free;

fake_cpuc.n_events = n;
fake_cpuc->n_events = n;

return x86_schedule_events(&fake_cpuc, n, NULL);
ret = x86_schedule_events(fake_cpuc, n, NULL);

out_free:
kfree(fake_cpuc);
out:
return ret;
}

const struct pmu *hw_perf_event_init(struct perf_event *event)
Expand Down

0 comments on commit 5c266c9

Please sign in to comment.