diff options
| author | Anton Blanchard <anton@samba.org> | 2006-01-09 15:41:31 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 16:02:52 +1100 |
| commit | 32a33994d513606d29e87e152deb67ba5f3c8e82 (patch) | |
| tree | 2966bbe85eb2880aacc1dba045af7a02cee0aa26 /include | |
| parent | 9a699aefa87cb0379a67741926820c9271d748a9 (diff) | |
| download | linux-stable-32a33994d513606d29e87e152deb67ba5f3c8e82.tar.gz linux-stable-32a33994d513606d29e87e152deb67ba5f3c8e82.tar.bz2 linux-stable-32a33994d513606d29e87e152deb67ba5f3c8e82.zip | |
[PATCH] ppc64: Fix oprofile when compiled as a module
My recent changes to oprofile broke it when built as a module. Fix it by
using an enum instead of a function pointer. This way we still retain
the oprofile configuration in the cputable.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index d8798f31b360..ef6ead34a773 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -27,10 +27,17 @@ * via the mkdefs mechanism. */ struct cpu_spec; -struct op_powerpc_model; typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec); +enum powerpc_oprofile_type { + INVALID = 0, + RS64 = 1, + POWER4 = 2, + G4 = 3, + BOOKE = 4, +}; + struct cpu_spec { /* CPU is matched via (PVR & pvr_mask) == pvr_value */ unsigned int pvr_mask; @@ -56,7 +63,7 @@ struct cpu_spec { char *oprofile_cpu_type; /* Processor specific oprofile operations */ - struct op_powerpc_model *oprofile_model; + enum powerpc_oprofile_type oprofile_type; }; extern struct cpu_spec *cur_cpu_spec; |