From 6d2364bf7797e35bf2eb08cbda522fc52450d5da Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Fri, 27 Dec 2024 10:00:36 +0800 Subject: [PATCH] kernel: refresh `6.12` patches (#13238) --- target/linux/generic/hack-6.12/997-revert-strtobool.patch | 2 +- ...compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/generic/hack-6.12/997-revert-strtobool.patch b/target/linux/generic/hack-6.12/997-revert-strtobool.patch index 811b386c1..ac9ec7767 100644 --- a/target/linux/generic/hack-6.12/997-revert-strtobool.patch +++ b/target/linux/generic/hack-6.12/997-revert-strtobool.patch @@ -1,6 +1,6 @@ --- a/include/linux/kstrtox.h +++ b/include/linux/kstrtox.h -@@ -147,4 +147,9 @@ +@@ -147,4 +147,9 @@ extern long simple_strtol(const char *,c extern unsigned long long simple_strtoull(const char *,char **,unsigned int); extern long long simple_strtoll(const char *,char **,unsigned int); diff --git a/target/linux/generic/pending-6.12/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-6.12/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch index 0547d1e45..e28c106dd 100644 --- a/target/linux/generic/pending-6.12/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch +++ b/target/linux/generic/pending-6.12/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch @@ -19,8 +19,8 @@ Signed-off-by: Felix Fietkau + #endif /* __KERNEL__ */ - /* -@@ -314,6 +316,4 @@ static inline void *offset_to_ptr(const + /** +@@ -329,6 +331,4 @@ static inline void *offset_to_ptr(const */ #define prevent_tail_call_optimization() mb()