]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'kvm-s390-next-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 31 Mar 2025 10:08:11 +0000 (06:08 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 7 Apr 2025 11:10:21 +0000 (07:10 -0400)
Pointer print format fixes

1  2 
arch/s390/kvm/interrupt.c
arch/s390/kvm/kvm-s390.c

index 2811a6c093b8b47cb5af8a3378b4ebebd4b54a63,c0558f05400732b2fe6911c1ef58f86b62364770..60c360c18690f6b94e8483dab2c25f016451204b
@@@ -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)
Simple merge