OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[tomoyo/tomoyo-test1.git]
/
arch
/
powerpc
/
kvm
/
powerpc.c
diff --git
a/arch/powerpc/kvm/powerpc.c
b/arch/powerpc/kvm/powerpc.c
index
339267c
..
2a956b5
100644
(file)
--- a/
arch/powerpc/kvm/powerpc.c
+++ b/
arch/powerpc/kvm/powerpc.c
@@
-578,6
+578,12
@@
int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
break;
#endif
+#ifdef CONFIG_HAVE_KVM_IRQFD
+ case KVM_CAP_IRQFD_RESAMPLE:
+ r = !xive_enabled();
+ break;
+#endif
+
case KVM_CAP_PPC_ALLOC_HTAB:
r = hv_enabled;
break;