summaryrefslogtreecommitdiffstats
path: root/arch/s390/pci
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2019-05-22 14:22:34 +0100
committerIngo Molnar <mingo@kernel.org>2019-06-03 12:32:56 +0200
commit982164d62a4b2097c0db28ae7c31fc905af26bb8 (patch)
tree2a0d422ed72f61fb4ef77d1c47469b5178b5e212 /arch/s390/pci
parent90fde663aed0a1c27e50dd1bf3f121141b2fe9f2 (diff)
downloadlinux-982164d62a4b2097c0db28ae7c31fc905af26bb8.tar.gz
linux-982164d62a4b2097c0db28ae7c31fc905af26bb8.tar.bz2
linux-982164d62a4b2097c0db28ae7c31fc905af26bb8.zip
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@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Cc: aou@eecs.berkeley.edu Cc: arnd@arndb.de Cc: bp@alien8.de Cc: catalin.marinas@arm.com Cc: davem@davemloft.net Cc: fenghua.yu@intel.com Cc: herbert@gondor.apana.org.au Cc: ink@jurassic.park.msu.ru Cc: jhogan@kernel.org Cc: linux@armlinux.org.uk Cc: mattst88@gmail.com Cc: mpe@ellerman.id.au Cc: palmer@sifive.com Cc: paul.burton@mips.com Cc: paulus@samba.org Cc: ralf@linux-mips.org Cc: rth@twiddle.net Cc: tony.luck@intel.com Cc: vgupta@synopsys.com Link: https://lkml.kernel.org/r/20190522132250.26499-3-mark.rutland@arm.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/pci')
-rw-r--r--arch/s390/pci/pci_debug.c4
1 files 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)