diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 07:48:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 07:48:57 -0400 |
commit | b1fe9987b78755719e8627d58409174ba00c24de (patch) | |
tree | 9ee421e21ffeee79c0383a3f720cc126b0554e0b /arch/powerpc/kvm | |
parent | 17858ca65eef148d335ffd4cfc09228a1c1cbfb5 (diff) | |
parent | be77f87c001b770f13fe742becb08b847d9542f1 (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU changes from Paul E. McKenney:
"The major changes for this series are:
1. Simplify RCU's grace-period and callback processing based on
the new numbering for callbacks. These were posted to LKML at
https://lkml.org/lkml/2013/5/20/330.
2. Documentation updates. These were posted to LKML at
https://lkml.org/lkml/2013/5/20/348.
3. Miscellaneous fixes, including converting a few remaining printk()
calls to pr_*(). These were posted to LKML at
https://lkml.org/lkml/2013/5/20/324.
4. SRCU-related changes and fixes. These were posted to LKML at
https://lkml.org/lkml/2013/5/20/425.
5. Removal of TINY_PREEMPT_RCU in favor of TREE_PREEMPT_RCU for
single-CPU low-latency systems. These were posted to LKML at
https://lkml.org/lkml/2013/5/20/427."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 550f5928b394..2efa9dde741a 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c | |||
@@ -1864,7 +1864,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu) | |||
1864 | 1864 | ||
1865 | up_out: | 1865 | up_out: |
1866 | up_read(¤t->mm->mmap_sem); | 1866 | up_read(¤t->mm->mmap_sem); |
1867 | goto out; | 1867 | goto out_srcu; |
1868 | } | 1868 | } |
1869 | 1869 | ||
1870 | int kvmppc_core_init_vm(struct kvm *kvm) | 1870 | int kvmppc_core_init_vm(struct kvm *kvm) |