diff options
| author | Anton Blanchard <anton@samba.org> | 2005-09-06 14:55:35 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-06 16:09:21 +1000 |
| commit | dca859329cee9b4cf02c8b7cb805b49973292ed2 (patch) | |
| tree | 45148a86ec8ad469c4ff81ca7be0a58fde416149 | |
| parent | 1a410d883023da70806a0190c4bde104545cb9c6 (diff) | |
| download | linux-3.10-dca859329cee9b4cf02c8b7cb805b49973292ed2.tar.gz linux-3.10-dca859329cee9b4cf02c8b7cb805b49973292ed2.tar.bz2 linux-3.10-dca859329cee9b4cf02c8b7cb805b49973292ed2.zip | |
[PATCH] ppc64: Move oprofile_impl.h into include/asm-ppc64
Move oprofile_impl.h into include/asm-ppc64 in preparation for moving
oprofile_model into cpu feature struct.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/oprofile/common.c | 5 | ||||
| -rw-r--r-- | arch/ppc64/oprofile/op_model_power4.c | 3 | ||||
| -rw-r--r-- | arch/ppc64/oprofile/op_model_rs64.c | 3 | ||||
| -rw-r--r-- | include/asm-ppc64/oprofile_impl.h (renamed from arch/ppc64/oprofile/op_impl.h) | 3 |
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/ppc64/oprofile/common.c b/arch/ppc64/oprofile/common.c index 0260122a8d6..3e8daabf102 100644 --- a/arch/ppc64/oprofile/common.c +++ b/arch/ppc64/oprofile/common.c @@ -17,11 +17,8 @@ #include <asm/system.h> #include <asm/pmc.h> #include <asm/cputable.h> +#include <asm/oprofile_impl.h> -#include "op_impl.h" - -extern struct op_ppc64_model op_model_rs64; -extern struct op_ppc64_model op_model_power4; static struct op_ppc64_model *model; static struct op_counter_config ctr[OP_MAX_COUNTER]; diff --git a/arch/ppc64/oprofile/op_model_power4.c b/arch/ppc64/oprofile/op_model_power4.c index e469610efde..32b2bb5625f 100644 --- a/arch/ppc64/oprofile/op_model_power4.c +++ b/arch/ppc64/oprofile/op_model_power4.c @@ -16,11 +16,10 @@ #include <asm/cputable.h> #include <asm/systemcfg.h> #include <asm/rtas.h> +#include <asm/oprofile_impl.h> #define dbg(args...) -#include "op_impl.h" - static unsigned long reset_value[OP_MAX_COUNTER]; static int oprofile_running; diff --git a/arch/ppc64/oprofile/op_model_rs64.c b/arch/ppc64/oprofile/op_model_rs64.c index bcec506c266..08c5b333f5c 100644 --- a/arch/ppc64/oprofile/op_model_rs64.c +++ b/arch/ppc64/oprofile/op_model_rs64.c @@ -14,11 +14,10 @@ #include <asm/system.h> #include <asm/processor.h> #include <asm/cputable.h> +#include <asm/oprofile_impl.h> #define dbg(args...) -#include "op_impl.h" - static void ctrl_write(unsigned int i, unsigned int val) { unsigned int tmp = 0; diff --git a/arch/ppc64/oprofile/op_impl.h b/include/asm-ppc64/oprofile_impl.h index 7fa7eaabc03..b04f1dfb142 100644 --- a/arch/ppc64/oprofile/op_impl.h +++ b/include/asm-ppc64/oprofile_impl.h @@ -49,6 +49,9 @@ struct op_ppc64_model { int num_counters; }; +extern struct op_ppc64_model op_model_rs64; +extern struct op_ppc64_model op_model_power4; + static inline unsigned int ctr_read(unsigned int i) { switch(i) { |