projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[deliverable/linux.git]
/
include
/
linux
/
perf_event.h
diff --git
a/include/linux/perf_event.h
b/include/linux/perf_event.h
index 486e84ccb1f92545ec0d4f74aaa153abf0ff8049..4f7a61ca4b393dc837cb4ad278c4a66306247cbd 100644
(file)
--- a/
include/linux/perf_event.h
+++ b/
include/linux/perf_event.h
@@
-79,11
+79,6
@@
struct perf_branch_stack {
struct perf_branch_entry entries[0];
};
struct perf_branch_entry entries[0];
};
-struct perf_regs {
- __u64 abi;
- struct pt_regs *regs;
-};
-
struct task_struct;
/*
struct task_struct;
/*
@@
-610,7
+605,14
@@
struct perf_sample_data {
u32 reserved;
} cpu_entry;
struct perf_callchain_entry *callchain;
u32 reserved;
} cpu_entry;
struct perf_callchain_entry *callchain;
+
+ /*
+ * regs_user may point to task_pt_regs or to regs_user_copy, depending
+ * on arch details.
+ */
struct perf_regs regs_user;
struct perf_regs regs_user;
+ struct pt_regs regs_user_copy;
+
struct perf_regs regs_intr;
u64 stack_user_size;
} ____cacheline_aligned;
struct perf_regs regs_intr;
u64 stack_user_size;
} ____cacheline_aligned;
This page took
0.030359 seconds
and
5
git commands to generate.