From 33aaea3164ff48b87a533dbba0314e45ed95ec50 Mon Sep 17 00:00:00 2001 From: Rouven Rastetter Date: Mon, 19 Jan 2015 21:31:01 +0100 Subject: [PATCH] NV_FILE_INODE patch --- kernel/nv-linux.h | 2 +- kernel/nv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h index f1bf6e9..ce330e9 100644 --- a/kernel/nv-linux.h +++ b/kernel/nv-linux.h @@ -2000,7 +2000,7 @@ extern NvU32 nv_assign_gpu_count; #if defined(NV_FILE_HAS_INODE) #define NV_FILE_INODE(file) (file)->f_inode #else -#define NV_FILE_INODE(file) (file)->f_dentry->d_inode +#define NV_FILE_INODE(file) (file)->f_path.dentry->d_inode #endif /* Stub out UVM in multi-RM builds */ diff --git a/kernel/nv.c b/kernel/nv.c index 2686203..b728169 100644 --- a/kernel/nv.c +++ b/kernel/nv.c @@ -2740,7 +2740,7 @@ nvidia_probe if (rm_get_cpu_type(sp, &nv_cpu_type) != NV_OK) nv_printf(NV_DBG_ERRORS, "NVRM: error retrieving cpu type\n"); - + if (NV_IS_GVI_DEVICE(nv)) { if (!rm_gvi_init_private_state(sp, nv)) -- 2.2.2