From: Greg Kroah-Hartman Date: Sun, 16 Jul 2023 14:32:49 +0000 (+0200) Subject: drop arm-9303-1-kprobes-avoid-missing-declaration-warning.patch X-Git-Tag: v6.1.39~71 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea818e98ce356f82a7db4d4f9c723415ac6b328a;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-9303-1-kprobes-avoid-missing-declaration-warning.patch --- diff --git a/queue-4.14/arm-9303-1-kprobes-avoid-missing-declaration-warning.patch b/queue-4.14/arm-9303-1-kprobes-avoid-missing-declaration-warning.patch deleted file mode 100644 index bd46ef1da42..00000000000 --- a/queue-4.14/arm-9303-1-kprobes-avoid-missing-declaration-warning.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 04966809110d87d032419aafec1eeae5df3ec796 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Jun 2023 19:28:42 +0100 -Subject: ARM: 9303/1: kprobes: avoid missing-declaration warnings - -From: Arnd Bergmann - -[ Upstream commit 1b9c3ddcec6a55e15d3e38e7405e2d078db02020 ] - -checker_stack_use_t32strd() and kprobe_handler() can be made static since -they are not used from other files, while coverage_start_registers() -and __kprobes_test_case() are used from assembler code, and just need -a declaration to avoid a warning with the global definition. - -arch/arm/probes/kprobes/checkers-common.c:43:18: error: no previous prototype for 'checker_stack_use_t32strd' -arch/arm/probes/kprobes/core.c:236:16: error: no previous prototype for 'kprobe_handler' -arch/arm/probes/kprobes/test-core.c:723:10: error: no previous prototype for 'coverage_start_registers' -arch/arm/probes/kprobes/test-core.c:918:14: error: no previous prototype for '__kprobes_test_case_start' -arch/arm/probes/kprobes/test-core.c:952:14: error: no previous prototype for '__kprobes_test_case_end_16' -arch/arm/probes/kprobes/test-core.c:967:14: error: no previous prototype for '__kprobes_test_case_end_32' - -Fixes: 6624cf651f1a ("ARM: kprobes: collects stack consumption for store instructions") -Fixes: 454f3e132d05 ("ARM/kprobes: Remove jprobe arm implementation") -Acked-by: Masami Hiramatsu (Google) -Reviewed-by: Kees Cook -Signed-off-by: Arnd Bergmann -Signed-off-by: Russell King (Oracle) -Signed-off-by: Sasha Levin ---- - arch/arm/probes/kprobes/checkers-common.c | 2 +- - arch/arm/probes/kprobes/core.c | 2 +- - arch/arm/probes/kprobes/opt-arm.c | 2 -- - arch/arm/probes/kprobes/test-core.c | 2 +- - arch/arm/probes/kprobes/test-core.h | 4 ++++ - 5 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/probes/kprobes/checkers-common.c b/arch/arm/probes/kprobes/checkers-common.c -index 971119c294741..aa10e5e46ebb2 100644 ---- a/arch/arm/probes/kprobes/checkers-common.c -+++ b/arch/arm/probes/kprobes/checkers-common.c -@@ -48,7 +48,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn, - * Different from other insn uses imm8, the real addressing offset of - * STRD in T32 encoding should be imm8 * 4. See ARMARM description. - */ --enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn, -+static enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn, - struct arch_probes_insn *asi, - const struct decode_header *h) - { -diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c -index 3cd2066c2ca3c..01989c4bdf051 100644 ---- a/arch/arm/probes/kprobes/core.c -+++ b/arch/arm/probes/kprobes/core.c -@@ -244,7 +244,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb) - * kprobe, and that level is reserved for user kprobe handlers, so we can't - * risk encountering a new kprobe in an interrupt handler. - */ --void __kprobes kprobe_handler(struct pt_regs *regs) -+static void __kprobes kprobe_handler(struct pt_regs *regs) - { - struct kprobe *p, *cur; - struct kprobe_ctlblk *kcb; -diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c -index cf08cb7267670..1516c340a0766 100644 ---- a/arch/arm/probes/kprobes/opt-arm.c -+++ b/arch/arm/probes/kprobes/opt-arm.c -@@ -158,8 +158,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty) - } - } - --extern void kprobe_handler(struct pt_regs *regs); -- - static void - optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs) - { -diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c -index a10d7187ad2c5..941b7452d879d 100644 ---- a/arch/arm/probes/kprobes/test-core.c -+++ b/arch/arm/probes/kprobes/test-core.c -@@ -780,7 +780,7 @@ static const char coverage_register_lookup[16] = { - [REG_TYPE_NOSPPCX] = COVERAGE_ANY_REG | COVERAGE_SP, - }; - --unsigned coverage_start_registers(const struct decode_header *h) -+static unsigned coverage_start_registers(const struct decode_header *h) - { - unsigned regs = 0; - int i; -diff --git a/arch/arm/probes/kprobes/test-core.h b/arch/arm/probes/kprobes/test-core.h -index 94285203e9f74..459ebda077139 100644 ---- a/arch/arm/probes/kprobes/test-core.h -+++ b/arch/arm/probes/kprobes/test-core.h -@@ -456,3 +456,7 @@ void kprobe_thumb32_test_cases(void); - #else - void kprobe_arm_test_cases(void); - #endif -+ -+void __kprobes_test_case_start(void); -+void __kprobes_test_case_end_16(void); -+void __kprobes_test_case_end_32(void); --- -2.39.2 - diff --git a/queue-4.14/series b/queue-4.14/series index bf7f4324b9c..858b3d47254 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -10,7 +10,6 @@ md-raid10-fix-overflow-of-md-safe_mode_delay.patch md-raid10-fix-wrong-setting-of-max_corr_read_errors.patch md-raid10-fix-io-loss-while-replacement-replace-rdev.patch pm-domains-fix-integer-overflow-issues-in-genpd_pars.patch -arm-9303-1-kprobes-avoid-missing-declaration-warning.patch evm-complete-description-of-evm_inode_setattr.patch wifi-ath9k-fix-ar9003-mac-hardware-hang-check-regist.patch wifi-ath9k-avoid-referencing-uninit-memory-in-ath9k_.patch