From: Anton Blanchard Date: Tue, 6 Sep 2005 04:55:35 +0000 (+1000) Subject: [PATCH] ppc64: Move oprofile_impl.h into include/asm-ppc64 X-Git-Tag: accepted/tizen/common/20141203.182822~43736^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dca859329cee9b4cf02c8b7cb805b49973292ed2;p=platform%2Fkernel%2Flinux-arm64.git [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 Signed-off-by: Paul Mackerras --- diff --git a/arch/ppc64/oprofile/common.c b/arch/ppc64/oprofile/common.c index 0260122..3e8daab 100644 --- a/arch/ppc64/oprofile/common.c +++ b/arch/ppc64/oprofile/common.c @@ -17,11 +17,8 @@ #include #include #include +#include -#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 e469610..32b2bb5 100644 --- a/arch/ppc64/oprofile/op_model_power4.c +++ b/arch/ppc64/oprofile/op_model_power4.c @@ -16,11 +16,10 @@ #include #include #include +#include #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 bcec506..08c5b33 100644 --- a/arch/ppc64/oprofile/op_model_rs64.c +++ b/arch/ppc64/oprofile/op_model_rs64.c @@ -14,11 +14,10 @@ #include #include #include +#include #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 similarity index 95% rename from arch/ppc64/oprofile/op_impl.h rename to include/asm-ppc64/oprofile_impl.h index 7fa7eaa..b04f1df 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) {