From c49eed35375b713e16cfaea156906fc4e28bf791 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 30 Aug 2010 13:50:45 +0200 Subject: [PATCH] --- yaml --- r: 215849 b: refs/heads/master c: 7b4203e8cb5c5d9bc49da62b7a6fa4ba876a1b3f h: refs/heads/master i: 215847: d5646273f7c9e564646fa34c553e0e8468186e2f v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/powerpc.c | 1 + trunk/include/linux/kvm.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b9da876c170b..c155e715c271 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17bd158006a33615270f9dba15c62f49bd447435 +refs/heads/master: 7b4203e8cb5c5d9bc49da62b7a6fa4ba876a1b3f diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c index 028891c0baff..2f87a1627f6c 100644 --- a/trunk/arch/powerpc/kvm/powerpc.c +++ b/trunk/arch/powerpc/kvm/powerpc.c @@ -192,6 +192,7 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_PPC_SEGSTATE: case KVM_CAP_PPC_PAIRED_SINGLES: case KVM_CAP_PPC_UNSET_IRQ: + case KVM_CAP_PPC_IRQ_LEVEL: case KVM_CAP_ENABLE_CAP: case KVM_CAP_PPC_OSI: case KVM_CAP_PPC_GET_PVINFO: diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 37077045970b..919ae53adc5c 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -539,6 +539,7 @@ struct kvm_ppc_pvinfo { #define KVM_CAP_XCRS 56 #endif #define KVM_CAP_PPC_GET_PVINFO 57 +#define KVM_CAP_PPC_IRQ_LEVEL 58 #ifdef KVM_CAP_IRQ_ROUTING