From d51aba85181bb52d954d98191cf1594f444af84c Mon Sep 17 00:00:00 2001 From: 123485k <1758961307@qq.com> Date: Wed, 19 Feb 2025 21:43:13 +0800 Subject: [PATCH] Update for kernel 6.13: Switch to the new Intel CPU defines. Kernel 6.13 changed the Intel CPU define names and removed the X86_MATCH_VENDOR_FAM_MODEL; update tuxedo_keyboard.c to match. Signed-off-by: 123485k <1758961307@qq.com> --- Makefile | 10 +++++----- src/tuxedo_keyboard.c | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c60cf4d..95aeb7e 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,11 @@ # You should have received a copy of the GNU General Public License # along with this software. If not, see . # -obj-m := ./src/tuxedo_keyboard.o \ - ./src/clevo_wmi.o \ - ./src/clevo_acpi.o \ - ./src/tuxedo_io/tuxedo_io.o \ - ./src/uniwill_wmi.o +obj-m := src/tuxedo_keyboard.o \ + src/clevo_wmi.o \ + src/clevo_acpi.o \ + src/tuxedo_io/tuxedo_io.o \ + src/uniwill_wmi.o PWD := $(shell pwd) KDIR := /lib/modules/$(shell uname -r)/build diff --git a/src/tuxedo_keyboard.c b/src/tuxedo_keyboard.c index 36e3af7..dcad745 100644 --- a/src/tuxedo_keyboard.c +++ b/src/tuxedo_keyboard.c @@ -339,7 +339,12 @@ static const struct x86_cpu_id skip_tuxedo_dmi_string_check_match[] __initconst X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, NULL), X86_MATCH_VFM(INTEL_XEON_PHI_KNL, NULL), X86_MATCH_VFM(INTEL_XEON_PHI_KNM, NULL), +// Compatibility defines: INTEL_FAM5_QUARK_X1000 remove in 6.13 +#ifdef INTEL_FAM5_QUARK_X1000 X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL), +#else + X86_MATCH_VFM(INTEL_QUARK_X1000, NULL), +#endif X86_MATCH_VENDOR_FAM(AMD, 5, NULL), X86_MATCH_VENDOR_FAM(AMD, 6, NULL), X86_MATCH_VENDOR_FAM(AMD, 15, NULL),