diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 | 
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 | 
| commit | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e (patch) | |
| tree | c863dd43c84579d853f3a2ae0ee6ead46c967703 /drivers/gpu/drm/vmwgfx/ttm_object.c | |
| parent | 66f61c92889ff3ca365161fb29dd36d6354682ba (diff) | |
| parent | d724c9e54939a597592de3659541da11fc7aa112 (diff) | |
Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
PPC KVM fixes for 5.2
- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/ttm_object.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/ttm_object.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c index 36990b80e790..16077785ad47 100644 --- a/drivers/gpu/drm/vmwgfx/ttm_object.c +++ b/drivers/gpu/drm/vmwgfx/ttm_object.c  | |||
| @@ -174,7 +174,7 @@ int ttm_base_object_init(struct ttm_object_file *tfile, | |||
| 174 | kref_init(&base->refcount); | 174 | kref_init(&base->refcount); | 
| 175 | idr_preload(GFP_KERNEL); | 175 | idr_preload(GFP_KERNEL); | 
| 176 | spin_lock(&tdev->object_lock); | 176 | spin_lock(&tdev->object_lock); | 
| 177 | ret = idr_alloc(&tdev->idr, base, 0, 0, GFP_NOWAIT); | 177 | ret = idr_alloc(&tdev->idr, base, 1, 0, GFP_NOWAIT); | 
| 178 | spin_unlock(&tdev->object_lock); | 178 | spin_unlock(&tdev->object_lock); | 
| 179 | idr_preload_end(); | 179 | idr_preload_end(); | 
| 180 | if (ret < 0) | 180 | if (ret < 0) | 
