diff options
Diffstat (limited to 'kernel/trace/trace_sysprof.c')
-rw-r--r-- | kernel/trace/trace_sysprof.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c index a7974a552ca9..c080956f4d8e 100644 --- a/kernel/trace/trace_sysprof.c +++ b/kernel/trace/trace_sysprof.c | |||
@@ -33,12 +33,13 @@ static DEFINE_MUTEX(sample_timer_lock); | |||
33 | */ | 33 | */ |
34 | static DEFINE_PER_CPU(struct hrtimer, stack_trace_hrtimer); | 34 | static DEFINE_PER_CPU(struct hrtimer, stack_trace_hrtimer); |
35 | 35 | ||
36 | struct stack_frame { | 36 | struct stack_frame_user { |
37 | const void __user *next_fp; | 37 | const void __user *next_fp; |
38 | unsigned long return_address; | 38 | unsigned long return_address; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | static int copy_stack_frame(const void __user *fp, struct stack_frame *frame) | 41 | static int |
42 | copy_stack_frame(const void __user *fp, struct stack_frame_user *frame) | ||
42 | { | 43 | { |
43 | int ret; | 44 | int ret; |
44 | 45 | ||
@@ -125,7 +126,7 @@ trace_kernel(struct pt_regs *regs, struct trace_array *tr, | |||
125 | static void timer_notify(struct pt_regs *regs, int cpu) | 126 | static void timer_notify(struct pt_regs *regs, int cpu) |
126 | { | 127 | { |
127 | struct trace_array_cpu *data; | 128 | struct trace_array_cpu *data; |
128 | struct stack_frame frame; | 129 | struct stack_frame_user frame; |
129 | struct trace_array *tr; | 130 | struct trace_array *tr; |
130 | const void __user *fp; | 131 | const void __user *fp; |
131 | int is_user; | 132 | int is_user; |