summaryrefslogtreecommitdiffstats
path: root/include/linux/fb.h
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-10-18 20:27:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 08:52:36 -0700
commit3e680aae4e53ab54cdbb0c29257dae0cbb158e1c (patch)
tree389c2a60625b2f9dbd9555378a9d4917730f335e /include/linux/fb.h
parente53677113e32e6f118e31b8391a2eab7ee52c0a7 (diff)
downloadop-kernel-dev-3e680aae4e53ab54cdbb0c29257dae0cbb158e1c.zip
op-kernel-dev-3e680aae4e53ab54cdbb0c29257dae0cbb158e1c.tar.gz
fb: convert lock/unlock_kernel() into local fb mutex
Change lock_kernel()/unlock_kernel() to local fb mutex. Each frame buffer instance has its own mutex. The one line try_to_load() function is unrolled to request_module() in two places for readability. [righi.andrea@gmail.com: fb: fix NULL pointer BUG dereference in fb_open()] Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/fb.h')
-rw-r--r--include/linux/fb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 531ccd5..75a81ea 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -808,6 +808,7 @@ struct fb_tile_ops {
struct fb_info {
int node;
int flags;
+ struct mutex lock; /* Lock for open/release/ioctl funcs */
struct fb_var_screeninfo var; /* Current var */
struct fb_fix_screeninfo fix; /* Current fix */
struct fb_monspecs monspecs; /* Current Monitor specs */
OpenPOWER on IntegriCloud