From 41ed46b8d7b17b79257a75a0a114fa171fe67c4e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 16 Apr 2013 19:21:41 +0200 Subject: [PATCH] --- yaml --- r: 373055 b: refs/heads/master c: 79558f112fc0352e057f7b5e158e3d88b8b62c60 h: refs/heads/master i: 373053: 64e42e379d9b1a17b38488f2675037eeeaa5a86a 373051: d0e5a60ee5e7e0814c18d5d6b7e4b5a07e9d413d 373047: ede5cbeb2df65a556094312fced54d3b9b12fafe 373039: 071de94dfb88f00558c388e642a39166cd174ead 373023: 120311570c073df0fc8907faae22e2a6c9a3fc9c 372991: f9d1bb153e0077a4bbc4f2fe32bb5bf07dc092a7 v: v3 --- [refs] | 2 +- trunk/arch/arm/kvm/arm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d723f0d67491..c80b7b075722 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a71785dde307f6ac80e83c0ad3fd694912010a1 +refs/heads/master: 79558f112fc0352e057f7b5e158e3d88b8b62c60 diff --git a/trunk/arch/arm/kvm/arm.c b/trunk/arch/arm/kvm/arm.c index e4ad0bb01843..678596f699f3 100644 --- a/trunk/arch/arm/kvm/arm.c +++ b/trunk/arch/arm/kvm/arm.c @@ -805,7 +805,8 @@ static int vcpu_interrupt_line(struct kvm_vcpu *vcpu, int number, bool level) return 0; } -int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level) +int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, + bool line_status) { u32 irq = irq_level->irq; unsigned int irq_type, vcpu_idx, irq_num;