Re: [PATCH 3.2 46/77] drm: Fix an unwanted master inheritance v2

Ben Hutchings
2015-12-26T04:31:54Z

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

On Fri, 2015-12-25 at 15:13 +0100, Thomas Hellstrom wrote:
> On 12/24/2015 04:37 PM, Ben Hutchings wrote:
> > 3.2.75-rc1 review patch.  If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Thomas Hellstrom <thellstrom@vmware.com>
> >
> > commit a0af2e538c80f3e47f1d6ddf120a153ad909e8ad upstream.
[...]
> >  /**
> > + * drm_new_set_master - Allocate a new master object and become master for the
> > + * associated master realm.
> > + *
> > + * @dev: The associated device.
> > + * @fpriv: File private identifying the client.
> > + *
> > + * This function must be called with dev::struct_mutex held.
> > + * Returns negative error code on failure. Zero on success.
> > + */
> > +int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
> > +{
> > + struct drm_master *old_master;
> > + int ret;
> > +
> > + lockdep_assert_held_once(&dev->struct_mutex);
> > +
>
> Is lockdep_assert_held_once() backported into the 3.2 series?

Patch 45/77 in this series adds it.

Ben.

> If not,
> this line could probably be replaced by lockdep_assert_held() for stable
> kernels or removed entirely.

--
Ben Hutchings
I say we take off; nuke the site from orbit. It's the only way to be sure.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]