diff options
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index b75f3a82c..136319beb 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -19,7 +19,6 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++-- drivers/firmware/efi/secureboot.c | 38 ++ - drivers/gpu/drm/drm_aperture.c | 26 +- drivers/hid/hid-rmi.c | 64 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + drivers/input/rmi4/rmi_driver.c | 124 +++-- @@ -65,7 +64,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 67 files changed, 1559 insertions(+), 198 deletions(-) + 66 files changed, 1544 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2522b11e593f..852307b46301 100644 @@ -121,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 990d2ee79186..77bce7a7dc7c 100644 +index faa4880f25f7..6135cccdcf3f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -749,49 +748,6 @@ index 000000000000..de0a3714a5d4 + } + } +} -diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c -index 74bd4a76b253..059fd71424f6 100644 ---- a/drivers/gpu/drm/drm_aperture.c -+++ b/drivers/gpu/drm/drm_aperture.c -@@ -329,7 +329,20 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, - const struct drm_driver *req_driver) - { - resource_size_t base, size; -- int bar, ret = 0; -+ int bar, ret; -+ -+ /* -+ * WARNING: Apparently we must kick fbdev drivers before vgacon, -+ * otherwise the vga fbdev driver falls over. -+ */ -+#if IS_REACHABLE(CONFIG_FB) -+ ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name); -+ if (ret) -+ return ret; -+#endif -+ ret = vga_remove_vgacon(pdev); -+ if (ret) -+ return ret; - - for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) { - if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) -@@ -339,15 +352,6 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, - drm_aperture_detach_drivers(base, size); - } - -- /* -- * WARNING: Apparently we must kick fbdev drivers before vgacon, -- * otherwise the vga fbdev driver falls over. -- */ --#if IS_REACHABLE(CONFIG_FB) -- ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name); --#endif -- if (ret == 0) -- ret = vga_remove_vgacon(pdev); -- return ret; -+ return 0; - } - EXPORT_SYMBOL(drm_aperture_remove_conflicting_pci_framebuffers); diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..2460c6bd46f8 100644 --- a/drivers/hid/hid-rmi.c |