diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
| commit | 8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch) | |
| tree | 67349c6a69740150b67c4c39de49cde9b3648aa5 /drivers/gpu/drm/drm_auth.c | |
| parent | 94f61a7666224ab307e387ff0d146055ae77e6ab (diff) | |
| parent | e29206381a1436e0f47c0f5b9a23159a03c57715 (diff) | |
| download | talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip | |
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'drivers/gpu/drm/drm_auth.c')
| -rw-r--r-- | drivers/gpu/drm/drm_auth.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 3f46772f0cb2..ba23790450e9 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -101,7 +101,7 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv, * Searches and unlinks the entry in drm_device::magiclist with the magic * number hash key, while holding the drm_device::struct_mutex lock. */ -static int drm_remove_magic(struct drm_master *master, drm_magic_t magic) +int drm_remove_magic(struct drm_master *master, drm_magic_t magic) { struct drm_magic_entry *pt; struct drm_hash_item *hash; @@ -136,6 +136,8 @@ static int drm_remove_magic(struct drm_master *master, drm_magic_t magic) * If there is a magic number in drm_file::magic then use it, otherwise * searches an unique non-zero magic number and add it associating it with \p * file_priv. + * This ioctl needs protection by the drm_global_mutex, which protects + * struct drm_file::magic and struct drm_magic_entry::priv. */ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) { @@ -173,6 +175,8 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) * \return zero if authentication successed, or a negative number otherwise. * * Checks if \p file_priv is associated with the magic number passed in \arg. + * This ioctl needs protection by the drm_global_mutex, which protects + * struct drm_file::magic and struct drm_magic_entry::priv. */ int drm_authmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) |
