|
Line
Link Here
|
| 0 |
-- a/kernel/common/inc/nv-linux.h |
0 |
++ b/kernel/common/inc/nv-linux.h |
|
Lines 1990-1991
Link Here
|
| 1990 |
|
1990 |
|
|
|
1991 |
#if defined(CONFIG_HAVE_ARCH_PFN_VALID) || LINUX_VERSION_CODE < KERNEL_VERSION(6,1,76) |
| 1992 |
# define nv_pfn_valid pfn_valid |
| 1993 |
#else |
| 1994 |
/* pre-6.1.76 kernel pfn_valid version without GPL rcu_read_lock/unlock() */ |
| 1995 |
static inline int nv_pfn_valid(unsigned long pfn) |
| 1996 |
{ |
| 1997 |
struct mem_section *ms; |
| 1998 |
|
| 1999 |
if (PHYS_PFN(PFN_PHYS(pfn)) != pfn) |
| 2000 |
return 0; |
| 2001 |
|
| 2002 |
if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) |
| 2003 |
return 0; |
| 2004 |
|
| 2005 |
ms = __pfn_to_section(pfn); |
| 2006 |
if (!valid_section(ms)) |
| 2007 |
return 0; |
| 2008 |
|
| 2009 |
return early_section(ms) || pfn_section_valid(ms, pfn); |
| 2010 |
} |
| 2011 |
#endif |
| 1991 |
#endif /* _NV_LINUX_H_ */ |
2012 |
#endif /* _NV_LINUX_H_ */ |
| 1992 |
-- a/kernel/nvidia/nv-mmap.c |
2013 |
++ b/kernel/nvidia/nv-mmap.c |
|
Lines 576-578
Link Here
|
| 576 |
if (!IS_REG_OFFSET(nv, access_start, access_len) && |
576 |
if (!IS_REG_OFFSET(nv, access_start, access_len) && |
| 577 |
(pfn_valid(PFN_DOWN(mmap_start)))) |
577 |
(nv_pfn_valid(PFN_DOWN(mmap_start)))) |
| 578 |
{ |
578 |
{ |
| 579 |
-- a/kernel/nvidia/os-mlock.c |
579 |
++ b/kernel/nvidia/os-mlock.c |
|
Lines 102-104
Link Here
|
| 102 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
102 |
if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) || |
| 103 |
(!pfn_valid(pfn))) |
103 |
(!nv_pfn_valid(pfn))) |
| 104 |
{ |
104 |
{ |
|
Lines 176-178
Link Here
|
| 176 |
|
176 |
|
| 177 |
if (pfn_valid(pfn)) |
177 |
if (nv_pfn_valid(pfn)) |
| 178 |
{ |
178 |
{ |
