git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[sfrench/cifs-2.6.git]
/
include
/
linux
/
kvm_host.h
diff --git
a/include/linux/kvm_host.h
b/include/linux/kvm_host.h
index 866ed30843636b0c5218a41e84fa0442b5d0c8a3..a0557422715e596ee46451c72e8184bff4b3201d 100644
(file)
--- a/
include/linux/kvm_host.h
+++ b/
include/linux/kvm_host.h
@@
-206,7
+206,7
@@
struct kvm {
struct mutex irq_lock;
#ifdef CONFIG_HAVE_KVM_IRQCHIP
- struct kvm_irq_routing_table *irq_routing;
+ struct kvm_irq_routing_table
__rcu
*irq_routing;
struct hlist_head mask_notifier_list;
struct hlist_head irq_ack_notifier_list;
#endif