From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 31 Mar 2025 10:08:11 +0000 (-0400)
Subject: Merge tag 'kvm-s390-next-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.16-rc1~129^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bf050f9cb5985678a5835073c2e63f0e3cb2b3b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'kvm-s390-next-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

Pointer print format fixes
---

6bf050f9cb5985678a5835073c2e63f0e3cb2b3b
diff --cc arch/s390/kvm/interrupt.c
index 2811a6c093b8b,c0558f0540073..60c360c18690f
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@@ -3174,10 -3174,11 +3174,10 @@@ void kvm_s390_gisa_init(struct kvm *kvm
  	gi->alert.mask = 0;
  	spin_lock_init(&gi->alert.ref_lock);
  	gi->expires = 50 * 1000; /* 50 usec */
 -	hrtimer_init(&gi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 -	gi->timer.function = gisa_vcpu_kicker;
 +	hrtimer_setup(&gi->timer, gisa_vcpu_kicker, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  	memset(gi->origin, 0, sizeof(struct kvm_s390_gisa));
  	gi->origin->next_alert = (u32)virt_to_phys(gi->origin);
- 	VM_EVENT(kvm, 3, "gisa 0x%pK initialized", gi->origin);
+ 	VM_EVENT(kvm, 3, "gisa 0x%p initialized", gi->origin);
  }
  
  void kvm_s390_gisa_enable(struct kvm *kvm)