| From | "Paul E. McKenney" <> | Subject | [PATCH tip/core/rcu 48/48] kvm: more __rcu annotations | Date | Tue, 4 May 2010 13:19:58 -0700 |
| |
From: Arnd Bergmann <arnd@relay.de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Avi Kivity <avi@redhat.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> --- arch/x86/include/asm/kvm_host.h | 2 +- include/linux/kvm_host.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 06d9e79..9c65faf 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -384,7 +384,7 @@ struct kvm_mem_aliases { }; struct kvm_arch { - struct kvm_mem_aliases *aliases; + struct kvm_mem_aliases __rcu *aliases; unsigned int n_free_mmu_pages; unsigned int n_requested_mmu_pages; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 08fe794..282b041 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -169,7 +169,7 @@ struct kvm { raw_spinlock_t requests_lock; struct mutex slots_lock; struct mm_struct *mm; /* userspace tied to this vm */ - struct kvm_memslots *memslots; + struct kvm_memslots __rcu *memslots; struct srcu_struct srcu; #ifdef CONFIG_KVM_APIC_ARCHITECTURE u32 bsp_vcpu_id; @@ -179,7 +179,7 @@ struct kvm { atomic_t online_vcpus; struct list_head vm_list; struct mutex lock; - struct kvm_io_bus *buses[KVM_NR_BUSES]; + struct kvm_io_bus __rcu *buses[KVM_NR_BUSES]; #ifdef CONFIG_HAVE_KVM_EVENTFD struct { spinlock_t lock; -- 1.7.0
|