aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2006-03-26 19:23:29 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-28 00:19:49 -0500
commit72533db0121e11811366b5a456f4068d1a4d542c (patch)
treeb7dfcb86ca34e76efec8b7f2c2f165cf8414bd02 /include/asm-powerpc
parent0a26b1364f14852bc9a51db0ca63c5250c775627 (diff)
[PATCH] powerpc: Remove some ifdefs in oprofile_impl.h
- No one uses op_counter_config.valid, so remove it - No need to ifdef around function protypes. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/oprofile_impl.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/asm-powerpc/oprofile_impl.h b/include/asm-powerpc/oprofile_impl.h
index 338e6a7cff4a..df4defc6321c 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. */
19struct op_counter_config { 19struct 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;
@@ -56,17 +53,12 @@ struct op_powerpc_model {
56 int num_counters; 53 int num_counters;
57}; 54};
58 55
59#ifdef CONFIG_FSL_BOOKE
60extern struct op_powerpc_model op_model_fsl_booke; 56extern struct op_powerpc_model op_model_fsl_booke;
61#else /* Otherwise, it's classic */
62
63#ifdef CONFIG_PPC64
64extern struct op_powerpc_model op_model_rs64; 57extern struct op_powerpc_model op_model_rs64;
65extern struct op_powerpc_model op_model_power4; 58extern struct op_powerpc_model op_model_power4;
66
67#else /* Otherwise, CONFIG_PPC32 */
68extern struct op_powerpc_model op_model_7450; 59extern struct op_powerpc_model op_model_7450;
69#endif 60
61#ifndef CONFIG_FSL_BOOKE
70 62
71/* All the classic PPC parts use these */ 63/* All the classic PPC parts use these */
72static inline unsigned int ctr_read(unsigned int i) 64static inline unsigned int ctr_read(unsigned int i)