forked from pool/virtualbox
89ce80e57e
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=760
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From: Jiri Slaby <jslaby@suse.cz>
|
|
Subject: fix for kernel 6.13 build
|
|
References: bsc#1235146
|
|
|
|
---
|
|
src/VBox/Additions/linux/drm/vbox_drv.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
--- a/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
+++ b/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
@@ -43,7 +43,9 @@
|
|
# include <drm/drm_probe_helper.h>
|
|
#endif
|
|
|
|
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
|
|
+#if RTLNX_VER_MIN(6,13,0)
|
|
+# include <linux/aperture.h>
|
|
+#elif RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
|
|
# include <drm/drm_aperture.h>
|
|
#endif
|
|
|
|
@@ -85,7 +87,9 @@ static int vbox_pci_probe(struct pci_dev
|
|
int ret = 0;
|
|
|
|
# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
|
|
-# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,4)
|
|
+# if RTLNX_VER_MIN(6,13,0)
|
|
+ ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);
|
|
+# elif RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,4)
|
|
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
|
|
# else
|
|
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideofb");
|