diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-19 13:21:15 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-21 09:21:08 (GMT) |
commit | 654810ec899ea5f2fc2138fca1793b603d481ff4 (patch) | |
tree | 7b5e4d411d275a22606b81e0725ebc06acb7bff6 /include | |
parent | a3e48c10cca3287a845435dd8ca58ecbde72d847 (diff) | |
download | linux-fsl-qoriq-654810ec899ea5f2fc2138fca1793b603d481ff4.tar.xz |
[PATCH] powerpc: merge oprofile headers
Merge include/asm-ppc64/oprofile_ipml.h and arch/ppc/oprofile/op_impl.h
into include/asm-powerpc/oprofile_ipml.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/oprofile_impl.h (renamed from include/asm-ppc64/oprofile_impl.h) | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/asm-ppc64/oprofile_impl.h b/include/asm-powerpc/oprofile_impl.h index 50420e7..8013cd2 100644 --- a/include/asm-ppc64/oprofile_impl.h +++ b/include/asm-powerpc/oprofile_impl.h @@ -9,31 +9,39 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef OP_IMPL_H -#define OP_IMPL_H 1 +#ifndef _ASM_POWERPC_OPROFILE_IMPL_H +#define _ASM_POWERPC_OPROFILE_IMPL_H #define OP_MAX_COUNTER 8 /* 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; unsigned long kernel; +#ifdef __powerpc64__ /* We dont support per counter user/kernel selection */ +#endif unsigned long user; unsigned long unit_mask; }; /* System-wide configuration as set via oprofilefs. */ struct op_system_config { +#ifdef __powerpc64__ unsigned long mmcr0; unsigned long mmcr1; unsigned long mmcra; +#endif unsigned long enable_kernel; unsigned long enable_user; +#ifdef __powerpc64__ unsigned long backtrace_spinlocks; +#endif }; /* Per-arch configuration */ @@ -41,7 +49,9 @@ struct op_powerpc_model { void (*reg_setup) (struct op_counter_config *, struct op_system_config *, int num_counters); +#ifdef __powerpc64__ void (*cpu_setup) (void *); +#endif void (*start) (struct op_counter_config *); void (*stop) (void); void (*handle_interrupt) (struct pt_regs *, @@ -49,6 +59,7 @@ struct op_powerpc_model { int num_counters; }; +#ifdef __powerpc64__ extern struct op_powerpc_model op_model_rs64; extern struct op_powerpc_model op_model_power4; @@ -107,5 +118,6 @@ static inline void ctr_write(unsigned int i, unsigned int val) break; } } +#endif /* __powerpc64__ */ -#endif +#endif /* _ASM_POWERPC_OPROFILE_IMPL_H */ |