Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- kernel/nv-drm.c~ 2014-11-08 00:57:53.000000000 +0100
- +++ kernel/nv-drm.c 2014-11-13 21:03:37.589650873 +0100
- @@ -128,6 +128,10 @@ static struct drm_driver nv_drm_driver =
- .gem_prime_vmap = nv_gem_prime_vmap,
- .gem_prime_vunmap = nv_gem_prime_vunmap,
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
- + .set_busid = drm_pci_set_busid,
- +#endif
- +
- .name = "nvidia-drm",
- .desc = "NVIDIA DRM driver",
- .date = "20130102",
- diff --git a/nv-frontend.c~ b/nv-frontend.c
- index c8c8af1..00f0973 100644
- --- kernel/nv-frontend.c~
- +++ kernel/nv-frontend.c
- @@ -327,7 +327,7 @@ long nvidia_frontend_unlocked_ioctl(
- unsigned long i_arg
- )
- {
- - return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
- + return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- long nvidia_frontend_compat_ioctl(
- @@ -336,7 +336,7 @@ long nvidia_frontend_compat_ioctl(
- unsigned long i_arg
- )
- {
- - return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
- + return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- int nvidia_frontend_mmap(
- diff --git a/nv.c~ b/nv.c
- index 6b31000..3db114e 100644
- --- kernel/nv.c~
- +++ kernel/nv.c
- @@ -1796,7 +1796,7 @@ nvidia_unlocked_ioctl(
- unsigned long i_arg
- )
- {
- - return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
- + return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- /*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement