diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 43621c5d..df7e33d3 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -802,6 +802,9 @@ static const struct file_operations tegra_drm_fops = { .read = drm_read, .compat_ioctl = drm_compat_ioctl, .llseek = noop_llseek, +#if defined(NV_FOP_UNSIGNED_OFFSET_PRESENT) /* Linux v6.12 */ + .fop_flags = FOP_UNSIGNED_OFFSET, +#endif }; static int tegra_drm_context_cleanup(int id, void *p, void *data) diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile index b52bae21..2218998a 100644 --- a/scripts/conftest/Makefile +++ b/scripts/conftest/Makefile @@ -129,6 +129,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_ops_get_set_rxfh_has_rxfh_param_ar NV_CONFTEST_FUNCTION_COMPILE_TESTS += fd_empty NV_CONFTEST_FUNCTION_COMPILE_TESTS += fd_file NV_CONFTEST_FUNCTION_COMPILE_TESTS += folio_entire_mapcount +NV_CONFTEST_FUNCTION_COMPILE_TESTS += fop_unsigned_offset NV_CONFTEST_FUNCTION_COMPILE_TESTS += genpd_xlate_t_has_const_of_phandle_args NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_file_rcu_has_double_ptr_file_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh index 11be7472..2cbce08b 100755 --- a/scripts/conftest/conftest.sh +++ b/scripts/conftest/conftest.sh @@ -7286,6 +7286,24 @@ compile_test() { compile_check_conftest "$CODE" "NV_FOLIO_ENTIRE_MAPCOUNT_PRESENT" "" "functions" ;; + fop_unsigned_offset) + # + # Determine if definition FOP_UNSIGNED_OFFSET is present. + # + # Commit 641bb4394f40 ("fs: move FMODE_UNSIGNED_OFFSET to fop_flags") + # added the definition FOP_UNSIGNED_OFFSET in Linux v6.12. + # + CODE=" + #include + int conftest(void) + { + return FOP_UNSIGNED_OFFSET; + }" + + compile_check_conftest "$CODE" "NV_FOP_UNSIGNED_OFFSET_PRESENT" "" "types" + ;; + + genpd_xlate_t_has_const_of_phandle_args) # # Determine if genpd_xlate_t function pointer has a