diff options
Diffstat (limited to '0003-fbcon-Call-WARN_CONSOLE_UNLOCKED-where-applicable.patch')
| -rw-r--r-- | 0003-fbcon-Call-WARN_CONSOLE_UNLOCKED-where-applicable.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/0003-fbcon-Call-WARN_CONSOLE_UNLOCKED-where-applicable.patch b/0003-fbcon-Call-WARN_CONSOLE_UNLOCKED-where-applicable.patch new file mode 100644 index 000000000..fef33c118 --- /dev/null +++ b/0003-fbcon-Call-WARN_CONSOLE_UNLOCKED-where-applicable.patch @@ -0,0 +1,70 @@ +From 3bd3a0e330aae4fffa8028aba2407ef615ab040b Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Thu, 28 Jun 2018 15:20:28 +0200 +Subject: [PATCH 3/7] fbcon: Call WARN_CONSOLE_UNLOCKED() where applicable + +Replace comments about places where the console lock should be held with +calls to WARN_CONSOLE_UNLOCKED() to assert that it is actually held. + +Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> +--- + drivers/video/fbdev/core/fbcon.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c +index c910e74d46ff..cd8d52a967aa 100644 +--- a/drivers/video/fbdev/core/fbcon.c ++++ b/drivers/video/fbdev/core/fbcon.c +@@ -828,6 +828,8 @@ static int set_con2fb_map(int unit, int newidx, int user) + struct fb_info *oldinfo = NULL; + int found, err = 0; + ++ WARN_CONSOLE_UNLOCKED(); ++ + if (oldidx == newidx) + return 0; + +@@ -3044,6 +3046,8 @@ static int fbcon_fb_unbind(int idx) + { + int i, new_idx = -1, ret = 0; + ++ WARN_CONSOLE_UNLOCKED(); ++ + if (!fbcon_has_console_bind) + return 0; + +@@ -3094,6 +3098,8 @@ static int fbcon_fb_unregistered(struct fb_info *info) + { + int i, idx; + ++ WARN_CONSOLE_UNLOCKED(); ++ + idx = info->node; + for (i = first_fb_vc; i <= last_fb_vc; i++) { + if (con2fb_map[i] == idx) +@@ -3131,6 +3137,9 @@ static int fbcon_fb_unregistered(struct fb_info *info) + static void fbcon_remap_all(int idx) + { + int i; ++ ++ WARN_CONSOLE_UNLOCKED(); ++ + for (i = first_fb_vc; i <= last_fb_vc; i++) + set_con2fb_map(i, idx, 0); + +@@ -3177,6 +3186,8 @@ static int fbcon_fb_registered(struct fb_info *info) + { + int ret = 0, i, idx; + ++ WARN_CONSOLE_UNLOCKED(); ++ + idx = info->node; + fbcon_select_primary(info); + +-- +2.18.0 + |