Merge branches 'acpi-scan' and 'acpi-prm'

[linux-2.6-microblaze.git] / include / drm / drm_file.h

diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index 726cfe0..a3acb7a 100644 (file)
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -233,6 +233,10 @@ struct drm_file {
         * this only matches &drm_device.master if the master is the currently
         * active one.
         *
+        * To update @master, both &drm_device.master_mutex and
+        * @master_lookup_lock need to be held, therefore holding either of
+        * them is safe and enough for the read side.
+        *
         * When dereferencing this pointer, either hold struct
         * &drm_device.master_mutex for the duration of the pointer's use, or
         * use drm_file_get_master() if struct &drm_device.master_mutex is not