git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-powerpc
/
oprofile_impl.h
diff --git
a/include/asm-powerpc/oprofile_impl.h
b/include/asm-powerpc/oprofile_impl.h
index
5b33994
..
338e6a7
100644
(file)
--- a/
include/asm-powerpc/oprofile_impl.h
+++ b/
include/asm-powerpc/oprofile_impl.h
@@
-17,6
+17,9
@@
/* Per-counter configuration as set via oprofilefs. */
struct op_counter_config {
/* 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 enabled;
unsigned long event;
unsigned long count;
@@
-35,6
+38,9
@@
struct op_system_config {
#endif
unsigned long enable_kernel;
unsigned long enable_user;
#endif
unsigned long enable_kernel;
unsigned long enable_user;
+#ifdef CONFIG_PPC64
+ unsigned long backtrace_spinlocks;
+#endif
};
/* Per-arch configuration */
};
/* Per-arch configuration */
@@
-50,12
+56,17
@@
struct op_powerpc_model {
int num_counters;
};
int num_counters;
};
+#ifdef CONFIG_FSL_BOOKE
extern struct op_powerpc_model op_model_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;
extern struct op_powerpc_model op_model_rs64;
extern struct op_powerpc_model op_model_power4;
-extern struct op_powerpc_model op_model_7450;
-#ifndef CONFIG_FSL_BOOKE
+#else /* Otherwise, CONFIG_PPC32 */
+extern struct op_powerpc_model op_model_7450;
+#endif
/* All the classic PPC parts use these */
static inline unsigned int ctr_read(unsigned int i)
/* All the classic PPC parts use these */
static inline unsigned int ctr_read(unsigned int i)
@@
-123,7
+134,5
@@
static inline void ctr_write(unsigned int i, unsigned int val)
}
#endif /* !CONFIG_FSL_BOOKE */
}
#endif /* !CONFIG_FSL_BOOKE */
-extern void op_powerpc_backtrace(struct pt_regs * const regs, unsigned int depth);
-
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_OPROFILE_IMPL_H */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_OPROFILE_IMPL_H */