projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
include
/
linux
/
perf_event.h
diff --git
a/include/linux/perf_event.h
b/include/linux/perf_event.h
index
78fda2a
..
f291275
100644
(file)
--- a/
include/linux/perf_event.h
+++ b/
include/linux/perf_event.h
@@
-121,6
+121,7
@@
struct hw_perf_event {
struct { /* intel_cqm */
int cqm_state;
u32 cqm_rmid;
struct { /* intel_cqm */
int cqm_state;
u32 cqm_rmid;
+ int is_group_event;
struct list_head cqm_events_entry;
struct list_head cqm_groups_entry;
struct list_head cqm_group_entry;
struct list_head cqm_events_entry;
struct list_head cqm_groups_entry;
struct list_head cqm_group_entry;
@@
-128,6
+129,10
@@
struct hw_perf_event {
struct { /* itrace */
int itrace_started;
};
struct { /* itrace */
int itrace_started;
};
+ struct { /* amd_power */
+ u64 pwr_acc;
+ u64 ptsc;
+ };
#ifdef CONFIG_HAVE_HW_BREAKPOINT
struct { /* breakpoint */
/*
#ifdef CONFIG_HAVE_HW_BREAKPOINT
struct { /* breakpoint */
/*