diff options
-rw-r--r-- | arch/x86/oprofile/backtrace.c | 3 | ||||
-rw-r--r-- | arch/x86/oprofile/op_counter.h | 18 |
2 files changed, 10 insertions, 11 deletions
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index 36e324139f77..04df67f8a7ba 100644 --- a/arch/x86/oprofile/backtrace.c +++ b/arch/x86/oprofile/backtrace.c | |||
@@ -52,8 +52,7 @@ struct frame_head { | |||
52 | unsigned long ret; | 52 | unsigned long ret; |
53 | } __attribute__((packed)); | 53 | } __attribute__((packed)); |
54 | 54 | ||
55 | static struct frame_head * | 55 | static struct frame_head *dump_user_backtrace(struct frame_head *head) |
56 | dump_user_backtrace(struct frame_head *head) | ||
57 | { | 56 | { |
58 | struct frame_head bufhead[2]; | 57 | struct frame_head bufhead[2]; |
59 | 58 | ||
diff --git a/arch/x86/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h index 2880b15c4675..91b6a116165e 100644 --- a/arch/x86/oprofile/op_counter.h +++ b/arch/x86/oprofile/op_counter.h | |||
@@ -6,22 +6,22 @@ | |||
6 | * | 6 | * |
7 | * @author John Levon | 7 | * @author John Levon |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef OP_COUNTER_H | 10 | #ifndef OP_COUNTER_H |
11 | #define OP_COUNTER_H | 11 | #define OP_COUNTER_H |
12 | 12 | ||
13 | #define OP_MAX_COUNTER 8 | 13 | #define OP_MAX_COUNTER 8 |
14 | 14 | ||
15 | /* Per-perfctr configuration as set via | 15 | /* Per-perfctr configuration as set via |
16 | * oprofilefs. | 16 | * oprofilefs. |
17 | */ | 17 | */ |
18 | struct op_counter_config { | 18 | struct op_counter_config { |
19 | unsigned long count; | 19 | unsigned long count; |
20 | unsigned long enabled; | 20 | unsigned long enabled; |
21 | unsigned long event; | 21 | unsigned long event; |
22 | unsigned long kernel; | 22 | unsigned long kernel; |
23 | unsigned long user; | 23 | unsigned long user; |
24 | unsigned long unit_mask; | 24 | unsigned long unit_mask; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | extern struct op_counter_config counter_config[]; | 27 | extern struct op_counter_config counter_config[]; |