Skip to content

Commit 85d0b2e

Browse files
cyringCyrIng
authored and
CyrIng
committed
Merge branch 'linux_6_3'
2 parents 1b52ce5 + 36c3255 commit 85d0b2e

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

corefreqk.c

+15
Original file line numberDiff line numberDiff line change
@@ -22071,6 +22071,9 @@ static long CoreFreqK_ioctl( struct file *filp,
2207122071
static int CoreFreqK_mmap(struct file *pfile, struct vm_area_struct *vma)
2207222072
{
2207322073
unsigned long reqSize = vma->vm_end - vma->vm_start;
22074+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
22075+
vm_flags_t vm_ro = VM_READ;
22076+
#endif
2207422077
int rc = -EIO;
2207522078
UNUSED(pfile);
2207622079

@@ -22083,7 +22086,11 @@ static int CoreFreqK_mmap(struct file *pfile, struct vm_area_struct *vma)
2208322086
goto EXIT_PAGE;
2208422087
}
2208522088

22089+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
22090+
vm_flags_reset_once(vma, vm_ro);
22091+
#else
2208622092
vma->vm_flags = VM_READ;
22093+
#endif
2208722094
vma->vm_page_prot = PAGE_READONLY;
2208822095

2208922096
rc = remap_pfn_range( vma,
@@ -22123,7 +22130,11 @@ static int CoreFreqK_mmap(struct file *pfile, struct vm_area_struct *vma)
2212322130
return -EAGAIN;
2212422131
}
2212522132

22133+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
22134+
vm_flags_reset_once(vma, vm_ro);
22135+
#else
2212622136
vma->vm_flags = VM_READ;
22137+
#endif
2212722138
vma->vm_page_prot = PAGE_READONLY;
2212822139

2212922140
rc = remap_pfn_range( vma,
@@ -22150,7 +22161,11 @@ static int CoreFreqK_mmap(struct file *pfile, struct vm_area_struct *vma)
2215022161
goto EXIT_PAGE;
2215122162
}
2215222163

22164+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
22165+
vm_flags_reset_once(vma, vm_ro);
22166+
#else
2215322167
vma->vm_flags = VM_READ;
22168+
#endif
2215422169
vma->vm_page_prot = PAGE_READONLY;
2215522170

2215622171
rc = remap_pfn_range( vma,

coretypes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#define COREFREQ_MAJOR 1
8-
#define COREFREQ_MINOR 95
9-
#define COREFREQ_REV 5
8+
#define COREFREQ_MINOR 96
9+
#define COREFREQ_REV 0
1010

1111
#if !defined(CORE_COUNT)
1212
#define CORE_COUNT 256

dkms.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
AUTOINSTALL="yes"
66
REMAKE_INITRD="no"
77
DRV_PATH=/kernel/drivers/misc
8-
DRV_VERSION=1.95
8+
DRV_VERSION=1.96
99
PACKAGE_NAME="corefreqk"
1010
PACKAGE_VERSION="$DRV_VERSION"
1111
BUILT_MODULE_NAME[0]="corefreqk"

0 commit comments

Comments
 (0)