Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1499fa809e9e6713952ef84a7e9d51606881681f

Authored by Souptick Joarder
Committed by Paolo Bonzini
1 parent d7a8bea363

kvm: Change return type to vm_fault_t 

Use new return type vm_fault_t for fault handler. For
now, this is just documenting that the function returns
a VM_FAULT value rather than an errno. Once all instances
are converted, vm_fault_t will become a distinct type.

commit 1c8f422059ae ("mm: change return type to vm_fault_t")

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Showing 7 changed files with 7 additions and 7 deletions Side-by-side Diff

arch/mips/kvm/mips.c
Diff comments   View file @ 1499fa8
... ... @@ -1076,7 +1076,7 @@
1076 1076 return -ENOIOCTLCMD;
1077 1077 }
1078 1078  
1079   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
  1079 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
1080 1080 {
1081 1081 return VM_FAULT_SIGBUS;
1082 1082 }
arch/powerpc/kvm/powerpc.c
Diff comments   View file @ 1499fa8
... ... @@ -1830,7 +1830,7 @@
1830 1830 return r;
1831 1831 }
1832 1832  
1833   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
  1833 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
1834 1834 {
1835 1835 return VM_FAULT_SIGBUS;
1836 1836 }
arch/s390/kvm/kvm-s390.c
Diff comments   View file @ 1499fa8
... ... @@ -3993,7 +3993,7 @@
3993 3993 return r;
3994 3994 }
3995 3995  
3996   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
  3996 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
3997 3997 {
3998 3998 #ifdef CONFIG_KVM_S390_UCONTROL
3999 3999 if ((vmf->pgoff == KVM_S390_SIE_PAGE_OFFSET)
... ... @@ -3966,7 +3966,7 @@
3966 3966 return r;
3967 3967 }
3968 3968  
3969   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
  3969 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
3970 3970 {
3971 3971 return VM_FAULT_SIGBUS;
3972 3972 }
include/linux/kvm_host.h
Diff comments   View file @ 1499fa8
... ... @@ -739,7 +739,7 @@
739 739 unsigned int ioctl, unsigned long arg);
740 740 long kvm_arch_vcpu_ioctl(struct file *filp,
741 741 unsigned int ioctl, unsigned long arg);
742   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf);
  742 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf);
743 743  
744 744 int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext);
745 745  
... ... @@ -165,7 +165,7 @@
165 165 return 0;
166 166 }
167 167  
168   -int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
  168 +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
169 169 {
170 170 return VM_FAULT_SIGBUS;
171 171 }
... ... @@ -2358,7 +2358,7 @@
2358 2358 }
2359 2359 EXPORT_SYMBOL_GPL(kvm_vcpu_on_spin);
2360 2360  
2361   -static int kvm_vcpu_fault(struct vm_fault *vmf)
  2361 +static vm_fault_t kvm_vcpu_fault(struct vm_fault *vmf)
2362 2362 {
2363 2363 struct kvm_vcpu *vcpu = vmf->vma->vm_file->private_data;
2364 2364 struct page *page;