diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 11:04:08 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 11:04:08 -0400 |
| commit | e8b47165c3f064cbbfd4b4dedcd96ab63e9ce3cb (patch) | |
| tree | 03fdd1115e814465e5be687aebf9b5d80592210c | |
| parent | 40348844ea1b1f124ae22a1d4fde66817a5869f4 (diff) | |
| download | longterm-queue-4.18-e8b47165c3f064cbbfd4b4dedcd96ab63e9ce3cb.tar.gz | |
tty: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/vt-fbcon-deinitialize-resources-in-visual_init-after.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/vt-fbcon-deinitialize-resources-in-visual_init-after.patch b/queue/vt-fbcon-deinitialize-resources-in-visual_init-after.patch index 284810d..c61df4a 100644 --- a/queue/vt-fbcon-deinitialize-resources-in-visual_init-after.patch +++ b/queue/vt-fbcon-deinitialize-resources-in-visual_init-after.patch @@ -1,4 +1,4 @@ -From a1ad1cc9704f64c169261a76e1aee1cf1ae51832 Mon Sep 17 00:00:00 2001 +From 7a2be028b1e20b7434cb8019f3bc9812d4b4031b Mon Sep 17 00:00:00 2001 From: Grzegorz Halat <ghalat@redhat.com> Date: Fri, 26 Apr 2019 16:59:46 +0200 Subject: [PATCH] vt/fbcon: deinitialize resources in visual_init() after @@ -43,10 +43,10 @@ Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c -index fdd12f8c3deb..5c0ca1c24b6f 100644 +index f71b49d65ce8..a8ae36c2fb46 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c -@@ -1056,6 +1056,13 @@ static void visual_init(struct vc_data *vc, int num, int init) +@@ -755,6 +755,13 @@ static void visual_init(struct vc_data *vc, int num, int init) vc->vc_screenbuf_size = vc->vc_rows * vc->vc_size_row; } @@ -60,7 +60,7 @@ index fdd12f8c3deb..5c0ca1c24b6f 100644 int vc_allocate(unsigned int currcons) /* return 0 on success */ { struct vt_notifier_param param; -@@ -1103,6 +1110,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ +@@ -802,6 +809,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ return 0; err_free: @@ -68,7 +68,7 @@ index fdd12f8c3deb..5c0ca1c24b6f 100644 kfree(vc); vc_cons[currcons].d = NULL; return -ENOMEM; -@@ -1331,9 +1339,8 @@ struct vc_data *vc_deallocate(unsigned int currcons) +@@ -1014,9 +1022,8 @@ struct vc_data *vc_deallocate(unsigned int currcons) param.vc = vc = vc_cons[currcons].d; atomic_notifier_call_chain(&vt_notifier_list, VT_DEALLOCATE, ¶m); vcs_remove_sysfs(currcons); @@ -76,14 +76,14 @@ index fdd12f8c3deb..5c0ca1c24b6f 100644 + visual_deinit(vc); put_pid(vc->vt_pid); - module_put(vc->vc_sw->owner); - vc_uniscr_set(vc, NULL); kfree(vc->vc_screenbuf); vc_cons[currcons].d = NULL; + } diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c -index 786f9aab55df..a9c69ae30878 100644 +index 816c31ac037e..674639133de0 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c -@@ -1248,7 +1248,7 @@ finished: +@@ -1223,7 +1223,7 @@ static void fbcon_deinit(struct vc_data *vc) if (free_font) vc->vc_font.data = NULL; @@ -93,5 +93,5 @@ index 786f9aab55df..a9c69ae30878 100644 if (!con_is_bound(&fb_con)) -- -2.9.5 +2.7.4 |