| Message ID | 1488879162-20596-1-git-send-email-me@tobin.cc (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
"Tobin C. Harding" <me@tobin.cc> writes: > struct hcall_stats is only used in hvCall_inst.c. > > Move struct hcall_stats to hvCall_inst.c > > Resolves: #54 > Signed-off-by: Tobin C. Harding <me@tobin.cc> > --- > > Is this correct, adding 'Resolves: #XX' when fixing > github.com/linuxppc/linux issues? Not in the change log (the part above ---). That gets committed to the history, and we don't want to clutter that with github issue numbers. The kernel history will probably outlive the github issues, at which point the issue numbers become meaningless. You can put Resolves: in this section (below ---), if you like. That is just informational and doesn't get committed. But I'm also happy to just close the github issues manually. When I do that I make a link from the issue to the commit, but not the other way around. cheers
On Tue, 2017-03-07 at 09:32:42 UTC, tcharding wrote: > struct hcall_stats is only used in hvCall_inst.c. > > Move struct hcall_stats to hvCall_inst.c > > Signed-off-by: Tobin C. Harding <me@tobin.cc> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/017614a5d6c09ec9e0dc3fd46a5018 cheers
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index 77ff1ba..74599bd 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h @@ -364,16 +364,6 @@ long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...); long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...); long plpar_hcall9_raw(unsigned long opcode, unsigned long *retbuf, ...); -/* For hcall instrumentation. One structure per-hcall, per-CPU */ -struct hcall_stats { - unsigned long num_calls; /* number of calls (on this CPU) */ - unsigned long tb_total; /* total wall time (mftb) of calls. */ - unsigned long purr_total; /* total cpu time (PURR) of calls. */ - unsigned long tb_start; - unsigned long purr_start; -}; -#define HCALL_STAT_ARRAY_SIZE ((MAX_HCALL_OPCODE >> 2) + 1) - struct hvcall_mpp_data { unsigned long entitled_mem; unsigned long mapped_mem; diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c index f02ec3a..892db4f 100644 --- a/arch/powerpc/platforms/pseries/hvCall_inst.c +++ b/arch/powerpc/platforms/pseries/hvCall_inst.c @@ -29,6 +29,16 @@ #include <asm/trace.h> #include <asm/machdep.h> +/* For hcall instrumentation. One structure per-hcall, per-CPU */ +struct hcall_stats { + unsigned long num_calls; /* number of calls (on this CPU) */ + unsigned long tb_total; /* total wall time (mftb) of calls. */ + unsigned long purr_total; /* total cpu time (PURR) of calls. */ + unsigned long tb_start; + unsigned long purr_start; +}; +#define HCALL_STAT_ARRAY_SIZE ((MAX_HCALL_OPCODE >> 2) + 1) + DEFINE_PER_CPU(struct hcall_stats[HCALL_STAT_ARRAY_SIZE], hcall_stats); /*
struct hcall_stats is only used in hvCall_inst.c. Move struct hcall_stats to hvCall_inst.c Resolves: #54 Signed-off-by: Tobin C. Harding <me@tobin.cc> --- Is this correct, adding 'Resolves: #XX' when fixing github.com/linuxppc/linux issues? arch/powerpc/include/asm/hvcall.h | 10 ---------- arch/powerpc/platforms/pseries/hvCall_inst.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-)