git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Compile fixes for arch/powerpc dcr code
[safe/jmp/linux-2.6]
/
include
/
asm-powerpc
/
oprofile_impl.h
diff --git
a/include/asm-powerpc/oprofile_impl.h
b/include/asm-powerpc/oprofile_impl.h
index
338e6a7
..
94c0ad2
100644
(file)
--- 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 {
/* 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;
@@
-38,9
+35,6
@@
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 */
@@
-48,28
+42,24
@@
struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
- void (*cpu_setup) (
void
*);
+ void (*cpu_setup) (
struct op_counter_config
*);
void (*start) (struct op_counter_config *);
void (*start) (struct op_counter_config *);
+ void (*global_start) (struct op_counter_config *);
void (*stop) (void);
void (*stop) (void);
+ void (*global_stop) (void);
void (*handle_interrupt) (struct pt_regs *,
struct op_counter_config *);
int num_counters;
};
void (*handle_interrupt) (struct pt_regs *,
struct op_counter_config *);
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;
-
-#else /* Otherwise, CONFIG_PPC32 */
extern struct op_powerpc_model op_model_7450;
extern struct op_powerpc_model op_model_7450;
-#endif
+extern struct op_powerpc_model op_model_cell;
/* All the classic PPC parts use these */
/* All the classic PPC parts use these */
-static inline unsigned int ctr_read(unsigned int i)
+static inline unsigned int c
lassic_c
tr_read(unsigned int i)
{
switch(i) {
case 0:
{
switch(i) {
case 0:
@@
-97,7
+87,7
@@
static inline unsigned int ctr_read(unsigned int i)
}
}
}
}
-static inline void ctr_write(unsigned int i, unsigned int val)
+static inline void c
lassic_c
tr_write(unsigned int i, unsigned int val)
{
switch(i) {
case 0:
{
switch(i) {
case 0:
@@
-132,7
+122,9
@@
static inline void ctr_write(unsigned int i, unsigned int val)
break;
}
}
break;
}
}
-#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 */