diff options
| author | Anton Blanchard <anton@samba.org> | 2006-03-27 02:23:29 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 07:19:49 +0200 |
| commit | 72533db0121e11811366b5a456f4068d1a4d542c (patch) | |
| tree | b7dfcb86ca34e76efec8b7f2c2f165cf8414bd02 | |
| parent | ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc (diff) | |
| download | linux-72533db0121e11811366b5a456f4068d1a4d542c.tar.xz linux-72533db0121e11811366b5a456f4068d1a4d542c.zip | |
[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>
| -rw-r--r-- | include/asm-powerpc/oprofile_impl.h | 12 |
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 @@ /* Per-counter configuration as set via oprofilefs. */ struct op_counter_config { -#ifdef __powerpc64__ - unsigned long valid; -#endif unsigned long enabled; unsigned long event; unsigned long count; @@ -56,17 +53,12 @@ struct op_powerpc_model { int num_counters; }; -#ifdef CONFIG_FSL_BOOKE extern struct op_powerpc_model op_model_fsl_booke; -#else /* Otherwise, it's classic */ - -#ifdef CONFIG_PPC64 extern struct op_powerpc_model op_model_rs64; extern struct op_powerpc_model op_model_power4; - -#else /* Otherwise, CONFIG_PPC32 */ extern struct op_powerpc_model op_model_7450; -#endif + +#ifndef CONFIG_FSL_BOOKE /* All the classic PPC parts use these */ static inline unsigned int ctr_read(unsigned int i) |