rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream

Browse Source
This commit is contained in:
Hans de Goede 2018-08-10 13:29:46 +02:00
parent 6940250e4a
commit 5c4507dbff
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0010-fbcon-Do-not-takeover-the-console-from-atomic-contex.patch
View File

@ -45,23 +45,19 @@ index a3fd510..f812891 100644
static int fbcon_output_notifier(struct notifier_block *nb, static int fbcon_output_notifier(struct notifier_block *nb,
unsigned long action, void *data) unsigned long action, void *data)
@@ -3611,9 +3626,13 @@ static int fbcon_output_notifier(struct notifier_block *nb, @@ -3611,10 +3626,8 @@ static int fbcon_output_notifier(struct notifier_block *nb,
deferred_takeover = false; deferred_takeover = false;
logo_shown = FBCON_LOGO_DONTSHOW; logo_shown = FBCON_LOGO_DONTSHOW;
- for (i = 0; i < FB_MAX; i++) { - for (i = 0; i < FB_MAX; i++) {
- if (registered_fb[i]) - if (registered_fb[i])
- fbcon_fb_registered(registered_fb[i]); - fbcon_fb_registered(registered_fb[i]);
+ if (in_atomic() || irqs_disabled()) { - }
+ /* We may get called in atomic context */
+ schedule_work(&fbcon_deferred_takeover_work); + schedule_work(&fbcon_deferred_takeover_work);
+ } else {
+ for (i = 0; i < FB_MAX; i++) {
+ if (registered_fb[i])
+ fbcon_fb_registered(registered_fb[i]);
+ }
}
return NOTIFY_OK; return NOTIFY_OK;
}
-- --
2.18.0 2.18.0

3
kernel.spec
View File

@ -1907,6 +1907,9 @@ fi
# #
# #
%changelog %changelog
* Fri Aug 10 2018 Hans de Goede <hdegoede@redhat.com>
- Sync FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER bugfix with upstream
* Wed Aug 08 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc8.git1.1 * Wed Aug 08 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc8.git1.1
- Linux v4.18-rc8-2-g1236568ee3cb - Linux v4.18-rc8-2-g1236568ee3cb