Merge branch 'master' into for-next

3 files changed, 9 insertions, 4 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 29afd9a252ff..9b109f25e49c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -144,6 +144,7 @@ int kvm_arch_hardware_enable(void *garbage)
                                 VP_INIT_ENV : VP_INIT_ENV_INITALIZE,
                         __pa(kvm_vm_buffer), KVM_VM_BUFFER_BASE, &tmp_base);
         if (status != 0) {
+                spin_unlock(&vp_lock);
                 printk(KERN_WARNING"kvm: Failed to Enable VT Support!!!!\n");
                 return -EINVAL;
         }
@@ -979,11 +980,13 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&irq_event, argp, sizeof irq_event))
                         goto out;
+                r = -ENXIO;
                 if (irqchip_in_kernel(kvm)) {
                         __s32 status;
                         status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
                                     irq_event.irq, irq_event.level);
                         if (ioctl == KVM_IRQ_LINE_STATUS) {
+                                r = -EFAULT;
                                 irq_event.status = status;
                                 if (copy_to_user(argp, &irq_event,
                                                         sizeof irq_event))
@@ -1379,7 +1382,7 @@ static void kvm_release_vm_pages(struct kvm *kvm)
         int i, j;
         unsigned long base_gfn;
 
-        slots = rcu_dereference(kvm->memslots);
+        slots = kvm_memslots(kvm);
         for (i = 0; i < slots->nmemslots; i++) {
                 memslot = &slots->memslots[i];
                 base_gfn = memslot->base_gfn;
@@ -1535,8 +1538,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                         goto out;
 
                 if (copy_to_user(user_stack, stack,
-                                 sizeof(struct kvm_ia64_vcpu_stack)))
+                                 sizeof(struct kvm_ia64_vcpu_stack))) {
+                        r = -EFAULT;
                         goto out;
+                }
 
                 break;
         }
diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c
index 7a62f75778c5..f0b9cac82414 100644
--- a/arch/ia64/kvm/vmm.c
+++ b/arch/ia64/kvm/vmm.c
@@ -51,7 +51,7 @@ static int __init  kvm_vmm_init(void)
         vmm_fpswa_interface = fpswa_interface;
 
         /*Register vmm data to kvm side*/
-        return kvm_init(&vmm_info, 1024, THIS_MODULE);
+        return kvm_init(&vmm_info, 1024, 0, THIS_MODULE);
 }
 
 static void __exit kvm_vmm_exit(void)
diff --git a/arch/ia64/kvm/vmm_ivt.S b/arch/ia64/kvm/vmm_ivt.S
index 40920c630649..24018484c6e9 100644
--- a/arch/ia64/kvm/vmm_ivt.S
+++ b/arch/ia64/kvm/vmm_ivt.S
@@ -104,7 +104,7 @@ GLOBAL_ENTRY(kvm_vmm_panic)
         br.call.sptk.many b6=vmm_panic_handler;
 END(kvm_vmm_panic)
 
-    .section .text.ivt,"ax"
+    .section .text..ivt,"ax"
 
     .align 32768    // align on 32KB boundary
     .global kvm_ia64_ivt