Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Anton Blanchard and committed by
Paul Mackerras
72533db0 0a26b136

+2 -10
+2 -10
include/asm-powerpc/oprofile_impl.h
··· 17 17 18 18 /* Per-counter configuration as set via oprofilefs. */ 19 19 struct op_counter_config { 20 - #ifdef __powerpc64__ 21 - unsigned long valid; 22 - #endif 23 20 unsigned long enabled; 24 21 unsigned long event; 25 22 unsigned long count; ··· 53 56 int num_counters; 54 57 }; 55 58 56 - #ifdef CONFIG_FSL_BOOKE 57 59 extern struct op_powerpc_model op_model_fsl_booke; 58 - #else /* Otherwise, it's classic */ 59 - 60 - #ifdef CONFIG_PPC64 61 60 extern struct op_powerpc_model op_model_rs64; 62 61 extern struct op_powerpc_model op_model_power4; 63 - 64 - #else /* Otherwise, CONFIG_PPC32 */ 65 62 extern struct op_powerpc_model op_model_7450; 66 - #endif 63 + 64 + #ifndef CONFIG_FSL_BOOKE 67 65 68 66 /* All the classic PPC parts use these */ 69 67 static inline unsigned int ctr_read(unsigned int i)