|
Line
Link Here
|
| 0 |
-- a/kernel/common/inc/nv-linux.h |
0 |
++ b/kernel/common/inc/nv-linux.h |
|
Lines 2000-2001
Link Here
|
| 2000 |
|
2000 |
|
|
|
2001 |
#ifdef CONFIG_HAVE_ARCH_PFN_VALID |
| 2002 |
# define nv_pfn_valid pfn_valid |
| 2003 |
#else |
| 2004 |
/* pre-6.1.76 kernel pfn_valid version without GPL rcu_read_lock/unlock() */ |
| 2005 |
static inline int nv_pfn_valid(unsigned long pfn) |
| 2006 |
{ |
| 2007 |
struct mem_section *ms; |
| 2008 |
|
| 2009 |
if (PHYS_PFN(PFN_PHYS(pfn)) != pfn) |
| 2010 |
return 0; |
| 2011 |
|
| 2012 |
if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) |
| 2013 |
return 0; |
| 2014 |
|
| 2015 |
ms = __pfn_to_section(pfn); |
| 2016 |
if (!valid_section(ms)) |
| 2017 |
return 0; |
| 2018 |
|
| 2019 |
return early_section(ms) || pfn_section_valid(ms, pfn); |
| 2020 |
} |
| 2021 |
#endif |
| 2001 |
#endif /* _NV_LINUX_H_ */ |
2022 |
#endif /* _NV_LINUX_H_ */ |
| 2002 |
-- a/kernel/nvidia/nv-mmap.c |
2023 |
++ b/kernel/nvidia/nv-mmap.c |
|
Lines 577-579
Link Here
|
| 577 |
!IS_REG_OFFSET(nv, access_start, access_len) && |
577 |
!IS_REG_OFFSET(nv, access_start, access_len) && |
| 578 |
(pfn_valid(PFN_DOWN(mmap_start)))) |
578 |
(nv_pfn_valid(PFN_DOWN(mmap_start)))) |
| 579 |
{ |
579 |
{ |
| 580 |
-- a/kernel/nvidia/os-mlock.c |
580 |
++ b/kernel/nvidia/os-mlock.c |
|
Lines 115-117
Link Here
|
| 115 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
115 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
| 116 |
(!pfn_valid(pfn))) |
116 |
(!nv_pfn_valid(pfn))) |
| 117 |
{ |
117 |
{ |
|
Lines 189-191
Link Here
|
| 189 |
|
189 |
|
| 190 |
if (pfn_valid(pfn)) |
190 |
if (nv_pfn_valid(pfn)) |
| 191 |
{ |
191 |
{ |
| 192 |
-- a/kernel-module-source/kernel-open/nvidia/nv-mmap.c |
192 |
++ b/kernel-module-source/kernel-open/nvidia/nv-mmap.c |
|
Lines 577-579
Link Here
|
| 577 |
!IS_REG_OFFSET(nv, access_start, access_len) && |
577 |
!IS_REG_OFFSET(nv, access_start, access_len) && |
| 578 |
(pfn_valid(PFN_DOWN(mmap_start)))) |
578 |
(nv_pfn_valid(PFN_DOWN(mmap_start)))) |
| 579 |
{ |
579 |
{ |
| 580 |
-- a/kernel-module-source/kernel-open/nvidia/os-mlock.c |
580 |
++ b/kernel-module-source/kernel-open/nvidia/os-mlock.c |
|
Lines 115-117
Link Here
|
| 115 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
115 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
| 116 |
(!pfn_valid(pfn))) |
116 |
(!nv_pfn_valid(pfn))) |
| 117 |
{ |
117 |
{ |
|
Lines 189-191
Link Here
|
| 189 |
|
189 |
|
| 190 |
if (pfn_valid(pfn)) |
190 |
if (nv_pfn_valid(pfn)) |
| 191 |
{ |
191 |
{ |
