projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
ia64
/
kvm
/
kvm-ia64.c
diff --git
a/arch/ia64/kvm/kvm-ia64.c
b/arch/ia64/kvm/kvm-ia64.c
index 5b2dc0d10c8f4211d28e044a2071306d1ef955ed..c9aa236dc29b7cf68fe8526ea7fbcb6e02533354 100644
(file)
--- a/
arch/ia64/kvm/kvm-ia64.c
+++ b/
arch/ia64/kvm/kvm-ia64.c
@@
-125,7
+125,7
@@
long ia64_pal_vp_create(u64 *vpd, u64 *host_iva, u64 *opt_handler)
static DEFINE_SPINLOCK(vp_lock);
static DEFINE_SPINLOCK(vp_lock);
-int kvm_arch_hardware_enable(void
*garbage
)
+int kvm_arch_hardware_enable(void)
{
long status;
long tmp_base;
{
long status;
long tmp_base;
@@
-160,7
+160,7
@@
int kvm_arch_hardware_enable(void *garbage)
return 0;
}
return 0;
}
-void kvm_arch_hardware_disable(void
*garbage
)
+void kvm_arch_hardware_disable(void)
{
long status;
{
long status;
@@
-190,7
+190,7
@@
void kvm_arch_check_processor_compat(void *rtn)
*(int *)rtn = 0;
}
*(int *)rtn = 0;
}
-int kvm_
dev_ioctl_check_extension(
long ext)
+int kvm_
vm_ioctl_check_extension(struct kvm *kvm,
long ext)
{
int r;
{
int r;
@@
-702,7
+702,7
@@
again:
out:
srcu_read_unlock(&vcpu->kvm->srcu, idx);
if (r > 0) {
out:
srcu_read_unlock(&vcpu->kvm->srcu, idx);
if (r > 0) {
-
kvm_resched(vcpu
);
+
cond_resched(
);
idx = srcu_read_lock(&vcpu->kvm->srcu);
goto again;
}
idx = srcu_read_lock(&vcpu->kvm->srcu);
goto again;
}
@@
-1363,10
+1363,6
@@
static void kvm_release_vm_pages(struct kvm *kvm)
}
}
}
}
-void kvm_arch_sync_events(struct kvm *kvm)
-{
-}
-
void kvm_arch_destroy_vm(struct kvm *kvm)
{
kvm_iommu_unmap_guest(kvm);
void kvm_arch_destroy_vm(struct kvm *kvm)
{
kvm_iommu_unmap_guest(kvm);
@@
-1375,10
+1371,6
@@
void kvm_arch_destroy_vm(struct kvm *kvm)
kvm_release_vm_pages(kvm);
}
kvm_release_vm_pages(kvm);
}
-void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
-{
-}
-
void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
{
if (cpu != vcpu->cpu) {
void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
{
if (cpu != vcpu->cpu) {
@@
-1467,7
+1459,6
@@
void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
kfree(vcpu->arch.apic);
}
kfree(vcpu->arch.apic);
}
-
long kvm_arch_vcpu_ioctl(struct file *filp,
unsigned int ioctl, unsigned long arg)
{
long kvm_arch_vcpu_ioctl(struct file *filp,
unsigned int ioctl, unsigned long arg)
{
@@
-1550,12
+1541,8
@@
int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
return VM_FAULT_SIGBUS;
}
return VM_FAULT_SIGBUS;
}
-void kvm_arch_free_memslot(struct kvm_memory_slot *free,
- struct kvm_memory_slot *dont)
-{
-}
-
-int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
+int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
+ unsigned long npages)
{
return 0;
}
{
return 0;
}
@@
-1591,14
+1578,6
@@
int kvm_arch_prepare_memory_region(struct kvm *kvm,
return 0;
}
return 0;
}
-void kvm_arch_commit_memory_region(struct kvm *kvm,
- struct kvm_userspace_memory_region *mem,
- const struct kvm_memory_slot *old,
- enum kvm_mr_change change)
-{
- return;
-}
-
void kvm_arch_flush_shadow_all(struct kvm *kvm)
{
kvm_flush_remote_tlbs(kvm);
void kvm_arch_flush_shadow_all(struct kvm *kvm)
{
kvm_flush_remote_tlbs(kvm);
@@
-1847,10
+1826,6
@@
int kvm_arch_hardware_setup(void)
return 0;
}
return 0;
}
-void kvm_arch_hardware_unsetup(void)
-{
-}
-
int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq)
{
return __apic_accept_irq(vcpu, irq->vector);
int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq)
{
return __apic_accept_irq(vcpu, irq->vector);