Commit-ID: 982164d62a4b2097c0db28ae7c31fc905af26bb8 Gitweb: https://git.kernel.org/tip/982164d62a4b2097c0db28ae7c31fc905af26bb8 Author: Mark Rutland <mark.rutland@xxxxxxx> AuthorDate: Wed, 22 May 2019 14:22:34 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Mon, 3 Jun 2019 12:32:56 +0200 locking/atomic, s390/pci: Prepare for atomic64_read() conversion The return type of atomic64_read() varies by architecture. It may return long (e.g. powerpc), long long (e.g. arm), or s64 (e.g. x86_64). This is somewhat painful, and mandates the use of explicit casts in some cases (e.g. when printing the return value). To ameliorate matters, subsequent patches will make the atomic64 API consistently use s64. As a preparatory step, this patch updates the s390 pci debug code to treat the return value of atomic64_read() as s64, using an explicit cast. This cast will be removed once the s64 conversion is complete. Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: aou@xxxxxxxxxxxxxxxxx Cc: arnd@xxxxxxxx Cc: bp@xxxxxxxxx Cc: catalin.marinas@xxxxxxx Cc: davem@xxxxxxxxxxxxx Cc: fenghua.yu@xxxxxxxxx Cc: herbert@xxxxxxxxxxxxxxxxxxx Cc: ink@xxxxxxxxxxxxxxxxxxxx Cc: jhogan@xxxxxxxxxx Cc: linux@xxxxxxxxxxxxxxx Cc: mattst88@xxxxxxxxx Cc: mpe@xxxxxxxxxxxxxx Cc: palmer@xxxxxxxxxx Cc: paul.burton@xxxxxxxx Cc: paulus@xxxxxxxxx Cc: ralf@xxxxxxxxxxxxxx Cc: rth@xxxxxxxxxxx Cc: tony.luck@xxxxxxxxx Cc: vgupta@xxxxxxxxxxxx Link: https://lkml.kernel.org/r/20190522132250.26499-3-mark.rutland@xxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/s390/pci/pci_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c index 6b48ca7760a7..45eccf79e990 100644 --- a/arch/s390/pci/pci_debug.c +++ b/arch/s390/pci/pci_debug.c @@ -74,8 +74,8 @@ static void pci_sw_counter_show(struct seq_file *m) int i; for (i = 0; i < ARRAY_SIZE(pci_sw_names); i++, counter++) - seq_printf(m, "%26s:\t%lu\n", pci_sw_names[i], - atomic64_read(counter)); + seq_printf(m, "%26s:\t%llu\n", pci_sw_names[i], + (s64)atomic64_read(counter)); } static int pci_perf_show(struct seq_file *m, void *v)
|