diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config old mode 100755 new mode 100644 index 263f23cc..2e4a3356 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.5 Kernel Configuration +# Linux/x86_64 5.10.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 10.2.1 20201212" CONFIG_CC_IS_GCC=y @@ -188,7 +188,6 @@ CONFIG_UTS_NS=y CONFIG_TIME_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y -CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y @@ -873,7 +872,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -10109,7 +10107,6 @@ CONFIG_DMA_OPS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y CONFIG_DMA_CMA=y # CONFIG_DMA_PERNUMA_CMA is not set @@ -10477,6 +10474,7 @@ CONFIG_TEST_XARRAY=m # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_LIVEPATCH is not set # CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_MEMINIT is not set diff --git a/kernel/kernel/files/patches/linux/patch-5.10.11.xz b/kernel/kernel/files/patches/linux/patch-5.10.11.xz new file mode 100644 index 00000000..93aadcd3 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-5.10.11.xz differ diff --git a/kernel/kernel/files/patches/mageia/3rd-fix-kconfig.patch b/kernel/kernel/files/patches/mageia/3rd-fix-kconfig.patch index a513aa07..6d1a4406 100644 --- a/kernel/kernel/files/patches/mageia/3rd-fix-kconfig.patch +++ b/kernel/kernel/files/patches/mageia/3rd-fix-kconfig.patch @@ -42,4 +42,4 @@ diff -up ./3rdparty/viahss/Kconfig.tv ./3rdparty/viahss/Kconfig + help VIA High Speed Serial is a little kernel module (1 KB) which enables high speed serial port modes of VIA VT82C686A or VT82C686B - southbridge-equipped motherboards. With this module, you can use the \ No newline at end of file + southbridge-equipped motherboards. With this module, you can use the diff --git a/kernel/kernel/files/patches/mageia/3rd-rtl8821ce-kernel-5.10.patch b/kernel/kernel/files/patches/mageia/3rd-rtl8821ce-kernel-5.10.patch new file mode 100644 index 00000000..08005840 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rtl8821ce-kernel-5.10.patch @@ -0,0 +1,162 @@ +diff -urp linux-5.10/3rdparty/rtl8821ce.orig/core/rtw_btcoex.c linux-5.10/3rdparty/rtl8821ce/core/rtw_btcoex.c +--- linux-5.10/3rdparty/rtl8821ce.orig/core/rtw_btcoex.c 2021-01-19 22:18:00.924067581 +0200 ++++ linux-5.10/3rdparty/rtl8821ce/core/rtw_btcoex.c 2021-01-19 22:22:20.057518961 +0200 +@@ -1474,15 +1474,20 @@ u8 rtw_btcoex_sendmsgbysocket(_adapter * + udpmsg.msg_control = NULL; + udpmsg.msg_controllen = 0; + udpmsg.msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL; ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) + error = sock_sendmsg(pcoex_info->udpsock, &udpmsg); + #else + error = sock_sendmsg(pcoex_info->udpsock, &udpmsg, msg_size); + #endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++#endif + if (error < 0) { + RTW_INFO("Error when sendimg msg, error:%d\n", error); + return _FAIL; +diff -urp linux-5.10/3rdparty/rtl8821ce.orig/core/rtw_wlan_util.c linux-5.10/3rdparty/rtl8821ce/core/rtw_wlan_util.c +--- linux-5.10/3rdparty/rtl8821ce.orig/core/rtw_wlan_util.c 2021-01-19 22:18:00.937068206 +0200 ++++ linux-5.10/3rdparty/rtl8821ce/core/rtw_wlan_util.c 2021-01-19 22:22:20.067519442 +0200 +@@ -4751,8 +4751,10 @@ int rtw_dev_nlo_info_set(struct pno_nlo_ + return 0; + } + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)) + fs = get_fs(); + set_fs(KERNEL_DS); ++#endif + + source = rtw_zmalloc(2048); + +@@ -4762,7 +4764,9 @@ int rtw_dev_nlo_info_set(struct pno_nlo_ + rtw_mfree(source, 2048); + } + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)) + set_fs(fs); ++#endif + filp_close(fp, NULL); + + RTW_INFO("-%s-\n", __func__); +diff -urp linux-5.10/3rdparty/rtl8821ce.orig/os_dep/linux/os_intfs.c linux-5.10/3rdparty/rtl8821ce/os_dep/linux/os_intfs.c +--- linux-5.10/3rdparty/rtl8821ce.orig/os_dep/linux/os_intfs.c 2021-01-19 22:18:01.078074981 +0200 ++++ linux-5.10/3rdparty/rtl8821ce/os_dep/linux/os_intfs.c 2021-01-19 22:22:20.068519490 +0200 +@@ -4008,14 +4008,18 @@ static int route_dump(u32 *gw_addr , int + msg.msg_controllen = 0; + msg.msg_flags = MSG_DONTWAIT; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) + err = sock_sendmsg(sock, &msg); + #else + err = sock_sendmsg(sock, &msg, sizeof(req)); + #endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++#endif + + if (err < 0) + goto out_sock; +@@ -4040,14 +4044,18 @@ restart: + iov_iter_init(&msg.msg_iter, READ, &iov, 1, PAGE_SIZE); + #endif + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)) + err = sock_recvmsg(sock, &msg, MSG_DONTWAIT); + #else + err = sock_recvmsg(sock, &msg, PAGE_SIZE, MSG_DONTWAIT); + #endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++#endif + + if (err < 0) + goto out_sock_pg; +@@ -4118,14 +4126,18 @@ done: + msg.msg_controllen = 0; + msg.msg_flags = MSG_DONTWAIT; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) + err = sock_sendmsg(sock, &msg); + #else + err = sock_sendmsg(sock, &msg, sizeof(req)); + #endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++#endif + + if (err > 0) + goto restart; +diff -urp linux-5.10/3rdparty/rtl8821ce.orig/os_dep/osdep_service.c linux-5.10/3rdparty/rtl8821ce/os_dep/osdep_service.c +--- linux-5.10/3rdparty/rtl8821ce.orig/os_dep/osdep_service.c 2021-01-19 22:18:01.081075125 +0200 ++++ linux-5.10/3rdparty/rtl8821ce/os_dep/osdep_service.c 2021-01-19 22:22:20.068519490 +0200 +@@ -2200,8 +2200,10 @@ static int isFileReadable(const char *pa + if (IS_ERR(fp)) + ret = PTR_ERR(fp); + else { ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++ #endif + + if (1 != readFile(fp, &buf, 1)) + ret = PTR_ERR(fp); +@@ -2214,7 +2216,9 @@ static int isFileReadable(const char *pa + #endif + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++#endif + filp_close(fp, NULL); + } + return ret; +@@ -2238,10 +2242,14 @@ static int retriveFromFile(const char *p + if (0 == ret) { + RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); + ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++ #endif + ret = readFile(fp, buf, sz); ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++ #endif + closeFile(fp); + + RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret); +@@ -2273,10 +2281,14 @@ static int storeToFile(const char *path, + if (0 == ret) { + RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); + ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + oldfs = get_fs(); + set_fs(KERNEL_DS); ++ #endif + ret = writeFile(fp, buf, sz); ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) + set_fs(oldfs); ++ #endif + closeFile(fp); + + RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret); diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 8ea45174..19394353 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -33,7 +33,7 @@ - patches/linux/patch-5.10.5.xz + patches/linux/patch-5.10.11.xz patches/mageia/fs-aufs5.10.patch patches/mageia/fs-aufs5.10-symbol-exports.patch @@ -70,6 +70,7 @@ patches/mageia/3rd-rtl8821ce.patch patches/mageia/3rd-rtl8821ce-Kconfig-Makefile.patch patches/mageia/3rd-rtl8821ce-5.8-fix.patch + patches/mageia/3rd-rtl8821ce-kernel-5.10.patch patches/mageia/3rd-fix-kconfig.patch @@ -140,6 +141,17 @@ + + 2021-01-29 + 5.10.11 + Version bump. + security + + systemRestart + + Mustafa Cinasal + muscnsl@gmail.com + 2021-01-06 5.10.5