From 4b46adddabc6c11712a00a14013a3230223672e8ddccda8c0927bf76b72c6203 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 28 Mar 2025 07:42:54 +0100 Subject: [PATCH] Fix for kernel 6.14 --- kernel-6-14.patch | 40 ++++++++++++++++++++++++++++++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 1 + 3 files changed, 46 insertions(+) create mode 100644 kernel-6-14.patch diff --git a/kernel-6-14.patch b/kernel-6-14.patch new file mode 100644 index 0000000..64489d5 --- /dev/null +++ b/kernel-6-14.patch @@ -0,0 +1,40 @@ +From: Jiri Slaby +Subject: fix for kernel 6.14 build +References: kernel 6.14 + +For these kernel commits: +5be1fa8abd7b Pass parent directory inode and expected name to ->d_revalidate() +cb2e1c2136f7 drm: remove driver date from struct drm_driver and all drivers + +--- + src/VBox/Additions/linux/drm/vbox_drv.c | 2 ++ + src/VBox/Additions/linux/sharedfolders/utils.c | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +--- a/src/VBox/Additions/linux/drm/vbox_drv.c ++++ b/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -376,7 +376,9 @@ static struct drm_driver driver = { + #endif + .name = DRIVER_NAME, + .desc = DRIVER_DESC, ++#if RTLNX_VER_MAX(6,14,0) + .date = DRIVER_DATE, ++#endif + .major = DRIVER_MAJOR, + .minor = DRIVER_MINOR, + .patchlevel = DRIVER_PATCHLEVEL, +--- a/src/VBox/Additions/linux/sharedfolders/utils.c ++++ b/src/VBox/Additions/linux/sharedfolders/utils.c +@@ -1162,7 +1162,11 @@ int vbsf_path_from_dentry(struct vbsf_su + * + * @note Caller holds no relevant locks, just a dentry reference. + */ +-#if RTLNX_VER_MIN(3,6,0) ++#if RTLNX_VER_MIN(6,14,0) ++static int vbsf_dentry_revalidate(struct inode *parent_dir, ++ const struct qstr *name, ++ struct dentry *dentry, unsigned flags) ++#elif RTLNX_VER_MIN(3,6,0) + static int vbsf_dentry_revalidate(struct dentry *dentry, unsigned flags) + #elif RTLNX_VER_MIN(2,6,0) + static int vbsf_dentry_revalidate(struct dentry *dentry, struct nameidata *nd) diff --git a/virtualbox.changes b/virtualbox.changes index 86b3f0f..6154a28 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 28 06:42:00 UTC 2025 - Jiri Slaby + +- add: kernel-6-14.patch + ------------------------------------------------------------------- Wed Feb 12 10:00:50 UTC 2025 - Daniel Garcia diff --git a/virtualbox.spec b/virtualbox.spec index f87a409..7438a45 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -123,6 +123,7 @@ Patch10: fix_for_leap15.5.patch Patch11: cxx17.patch Patch12: host-source.patch Patch13: kernel-6-13.patch +Patch14: kernel-6-14.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp BuildRequires: %{kernel_module_package_buildreqs} -- 2.51.1