public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pointer print format fixes

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAmfemSMACgkQ41TmuOI4
 ufjJSBAAyt4Y12hnen1IkMTpcmn4l1bvLKQ7NXOXuapLXeHJc0BvZ8okbEdNs7uo
 YUlRlOfSNvL2kAYJUaieQcNXoUxQqX/Yb+dsKcXuKIaWaxVvd4U4wLvWWe4y/9MS
 xp9/CjIKw17OmXLBCg0yi5hh3fFcSdPHedtcq2E/x4RaPWgxwnr+olPrwkakbum3
 OQE3azqvSRSMIvT24NsPki91lhJiyc+blqXb+SB68jkvbvtI4i/ESPzw1yYpmZEp
 2587kFdc3RXoFB0bW+2l8DVm+sxV6E+F3a/bDSjXcE5CHLT3RWYhfF1UI+fM5XrL
 aBpaCOSVcMu9L21uJeo2d1VMa3oROCGl5cbYwGsRPnLrL64QbphtDOkQ775E59+u
 ztk9S3UKgY9oaCePidnlsrjPS4tyqvj25jzdoC/nbHuW6fzRv67S+xhWEgIdvjf/
 n+nR9SZCIEzhYzHA5tyt+lTyCIw+vZbdOxzXor5klx8gfaY/hjRBY5ebcvq3P4ha
 umjNPhtZ/Gy6kWhPHcRXY//mBGkhkLwc/BvfotxCcFuMqZcpadBKbRT3NQ8r3JWA
 LA8VJC0z5YJh3PzzNPyiJINTYbgr3n7GF7+xWnOXpcVm6dGlNOOEpaMUd3zdCJl7
 D3Qdpux5/qfOd0MRgOFY3FHvS92ykf+yvT7V+Vcb287CLpdCuiY=
 =rF37
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Paolo Bonzini 2025-03-31 06:08:11 -04:00
commit adb9061ecc
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/s390/kvm/intercept.c
View file

@ -95,7 +95,7 @@ static int handle_validity(struct kvm_vcpu *vcpu)
vcpu->stat.exit_validity++; vcpu->stat.exit_validity++;
trace_kvm_s390_intercept_validity(vcpu, viwhy); trace_kvm_s390_intercept_validity(vcpu, viwhy);
KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%pK)", viwhy, KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%p)", viwhy,
current->pid, vcpu->kvm); current->pid, vcpu->kvm);
/* do not warn on invalid runtime instrumentation mode */ /* do not warn on invalid runtime instrumentation mode */

8
arch/s390/kvm/interrupt.c
View file

@ -3161,7 +3161,7 @@ void kvm_s390_gisa_clear(struct kvm *kvm)
if (!gi->origin) if (!gi->origin)
return; return;
gisa_clear_ipm(gi->origin); gisa_clear_ipm(gi->origin);
VM_EVENT(kvm, 3, "gisa 0x%pK cleared", gi->origin); VM_EVENT(kvm, 3, "gisa 0x%p cleared", gi->origin);
} }
void kvm_s390_gisa_init(struct kvm *kvm) void kvm_s390_gisa_init(struct kvm *kvm)
@ -3178,7 +3178,7 @@ void kvm_s390_gisa_init(struct kvm *kvm)
gi->timer.function = gisa_vcpu_kicker; gi->timer.function = gisa_vcpu_kicker;
memset(gi->origin, 0, sizeof(struct kvm_s390_gisa)); memset(gi->origin, 0, sizeof(struct kvm_s390_gisa));
gi->origin->next_alert = (u32)virt_to_phys(gi->origin); 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) void kvm_s390_gisa_enable(struct kvm *kvm)
@ -3219,7 +3219,7 @@ void kvm_s390_gisa_destroy(struct kvm *kvm)
process_gib_alert_list(); process_gib_alert_list();
hrtimer_cancel(&gi->timer); hrtimer_cancel(&gi->timer);
gi->origin = NULL; gi->origin = NULL;
VM_EVENT(kvm, 3, "gisa 0x%pK destroyed", gisa); VM_EVENT(kvm, 3, "gisa 0x%p destroyed", gisa);
} }
void kvm_s390_gisa_disable(struct kvm *kvm) void kvm_s390_gisa_disable(struct kvm *kvm)
@ -3468,7 +3468,7 @@ int __init kvm_s390_gib_init(u8 nisc)
} }
} }
KVM_EVENT(3, "gib 0x%pK (nisc=%d) initialized", gib, gib->nisc); KVM_EVENT(3, "gib 0x%p (nisc=%d) initialized", gib, gib->nisc);
goto out; goto out;
out_unreg_gal: out_unreg_gal:

10
arch/s390/kvm/kvm-s390.c
View file

@ -1020,7 +1020,7 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att
} }
mutex_unlock(&kvm->lock); mutex_unlock(&kvm->lock);
VM_EVENT(kvm, 3, "SET: max guest address: %lu", new_limit); VM_EVENT(kvm, 3, "SET: max guest address: %lu", new_limit);
VM_EVENT(kvm, 3, "New guest asce: 0x%pK", VM_EVENT(kvm, 3, "New guest asce: 0x%p",
(void *) kvm->arch.gmap->asce); (void *) kvm->arch.gmap->asce);
break; break;
} }
@ -3464,7 +3464,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
kvm_s390_gisa_init(kvm); kvm_s390_gisa_init(kvm);
INIT_LIST_HEAD(&kvm->arch.pv.need_cleanup); INIT_LIST_HEAD(&kvm->arch.pv.need_cleanup);
kvm->arch.pv.set_aside = NULL; kvm->arch.pv.set_aside = NULL;
KVM_EVENT(3, "vm 0x%pK created by pid %u", kvm, current->pid); KVM_EVENT(3, "vm 0x%p created by pid %u", kvm, current->pid);
return 0; return 0;
out_err: out_err:
@ -3527,7 +3527,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
kvm_s390_destroy_adapters(kvm); kvm_s390_destroy_adapters(kvm);
kvm_s390_clear_float_irqs(kvm); kvm_s390_clear_float_irqs(kvm);
kvm_s390_vsie_destroy(kvm); kvm_s390_vsie_destroy(kvm);
KVM_EVENT(3, "vm 0x%pK destroyed", kvm); KVM_EVENT(3, "vm 0x%p destroyed", kvm);
} }
/* Section: vcpu related */ /* Section: vcpu related */
@ -3648,7 +3648,7 @@ static int sca_switch_to_extended(struct kvm *kvm)
free_page((unsigned long)old_sca); free_page((unsigned long)old_sca);
VM_EVENT(kvm, 2, "Switched to ESCA (0x%pK -> 0x%pK)", VM_EVENT(kvm, 2, "Switched to ESCA (0x%p -> 0x%p)",
old_sca, kvm->arch.sca); old_sca, kvm->arch.sca);
return 0; return 0;
} }
@ -4025,7 +4025,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
goto out_free_sie_block; goto out_free_sie_block;
} }
VM_EVENT(vcpu->kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", VM_EVENT(vcpu->kvm, 3, "create cpu %d at 0x%p, sie block at 0x%p",
vcpu->vcpu_id, vcpu, vcpu->arch.sie_block); vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);
trace_kvm_s390_create_vcpu(vcpu->vcpu_id, vcpu, vcpu->arch.sie_block); trace_kvm_s390_create_vcpu(vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);

4
arch/s390/kvm/trace-s390.h
View file

@ -56,7 +56,7 @@ TRACE_EVENT(kvm_s390_create_vcpu,
__entry->sie_block = sie_block; __entry->sie_block = sie_block;
), ),
TP_printk("create cpu %d at 0x%pK, sie block at 0x%pK", TP_printk("create cpu %d at 0x%p, sie block at 0x%p",
__entry->id, __entry->vcpu, __entry->sie_block) __entry->id, __entry->vcpu, __entry->sie_block)
); );
@ -255,7 +255,7 @@ TRACE_EVENT(kvm_s390_enable_css,
__entry->kvm = kvm; __entry->kvm = kvm;
), ),
TP_printk("enabling channel I/O support (kvm @ %pK)\n", TP_printk("enabling channel I/O support (kvm @ %p)\n",
__entry->kvm) __entry->kvm)
); );