diff options
Diffstat (limited to 'include/asm-powerpc/oprofile_impl.h')
-rw-r--r-- | include/asm-powerpc/oprofile_impl.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/asm-powerpc/oprofile_impl.h b/include/asm-powerpc/oprofile_impl.h index 338e6a7cff4a..5b33994cd488 100644 --- a/include/asm-powerpc/oprofile_impl.h +++ b/include/asm-powerpc/oprofile_impl.h | |||
@@ -17,9 +17,6 @@ | |||
17 | 17 | ||
18 | /* Per-counter configuration as set via oprofilefs. */ | 18 | /* Per-counter configuration as set via oprofilefs. */ |
19 | struct op_counter_config { | 19 | struct op_counter_config { |
20 | #ifdef __powerpc64__ | ||
21 | unsigned long valid; | ||
22 | #endif | ||
23 | unsigned long enabled; | 20 | unsigned long enabled; |
24 | unsigned long event; | 21 | unsigned long event; |
25 | unsigned long count; | 22 | unsigned long count; |
@@ -38,9 +35,6 @@ struct op_system_config { | |||
38 | #endif | 35 | #endif |
39 | unsigned long enable_kernel; | 36 | unsigned long enable_kernel; |
40 | unsigned long enable_user; | 37 | unsigned long enable_user; |
41 | #ifdef CONFIG_PPC64 | ||
42 | unsigned long backtrace_spinlocks; | ||
43 | #endif | ||
44 | }; | 38 | }; |
45 | 39 | ||
46 | /* Per-arch configuration */ | 40 | /* Per-arch configuration */ |
@@ -56,17 +50,12 @@ struct op_powerpc_model { | |||
56 | int num_counters; | 50 | int num_counters; |
57 | }; | 51 | }; |
58 | 52 | ||
59 | #ifdef CONFIG_FSL_BOOKE | ||
60 | extern struct op_powerpc_model op_model_fsl_booke; | 53 | extern struct op_powerpc_model op_model_fsl_booke; |
61 | #else /* Otherwise, it's classic */ | ||
62 | |||
63 | #ifdef CONFIG_PPC64 | ||
64 | extern struct op_powerpc_model op_model_rs64; | 54 | extern struct op_powerpc_model op_model_rs64; |
65 | extern struct op_powerpc_model op_model_power4; | 55 | extern struct op_powerpc_model op_model_power4; |
66 | |||
67 | #else /* Otherwise, CONFIG_PPC32 */ | ||
68 | extern struct op_powerpc_model op_model_7450; | 56 | extern struct op_powerpc_model op_model_7450; |
69 | #endif | 57 | |
58 | #ifndef CONFIG_FSL_BOOKE | ||
70 | 59 | ||
71 | /* All the classic PPC parts use these */ | 60 | /* All the classic PPC parts use these */ |
72 | static inline unsigned int ctr_read(unsigned int i) | 61 | static inline unsigned int ctr_read(unsigned int i) |
@@ -134,5 +123,7 @@ static inline void ctr_write(unsigned int i, unsigned int val) | |||
134 | } | 123 | } |
135 | #endif /* !CONFIG_FSL_BOOKE */ | 124 | #endif /* !CONFIG_FSL_BOOKE */ |
136 | 125 | ||
126 | extern void op_powerpc_backtrace(struct pt_regs * const regs, unsigned int depth); | ||
127 | |||
137 | #endif /* __KERNEL__ */ | 128 | #endif /* __KERNEL__ */ |
138 | #endif /* _ASM_POWERPC_OPROFILE_IMPL_H */ | 129 | #endif /* _ASM_POWERPC_OPROFILE_IMPL_H */ |