Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -92,8 +92,6 @@ struct hw_perf_event_extra {
|
||||
int idx; /* index in shared_regs->regs[] */
|
||||
};
|
||||
|
||||
struct event_constraint;
|
||||
|
||||
/**
|
||||
* struct hw_perf_event - performance event hardware details:
|
||||
*/
|
||||
@@ -112,8 +110,6 @@ struct hw_perf_event {
|
||||
|
||||
struct hw_perf_event_extra extra_reg;
|
||||
struct hw_perf_event_extra branch_reg;
|
||||
|
||||
struct event_constraint *constraint;
|
||||
};
|
||||
struct { /* software */
|
||||
struct hrtimer hrtimer;
|
||||
|
Reference in New Issue
Block a user