From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 06:53:40 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.10.63~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9ad3fa679c379d6cc5342618e1e068ce9a67add;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: arm-omap1-ams-delta-remove-unused-function-ams_delta_camera_power.patch xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch --- diff --git a/queue-5.10/arm-omap1-ams-delta-remove-unused-function-ams_delta_camera_power.patch b/queue-5.10/arm-omap1-ams-delta-remove-unused-function-ams_delta_camera_power.patch new file mode 100644 index 00000000000..a22aae32a57 --- /dev/null +++ b/queue-5.10/arm-omap1-ams-delta-remove-unused-function-ams_delta_camera_power.patch @@ -0,0 +1,54 @@ +From bae989c4bc53f861cc1b706aab0194703e9907a8 Mon Sep 17 00:00:00 2001 +From: Maciej Falkowski +Date: Thu, 1 Apr 2021 18:04:34 +0200 +Subject: ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power + +From: Maciej Falkowski + +commit bae989c4bc53f861cc1b706aab0194703e9907a8 upstream. + +The ams_delta_camera_power() function is unused as reports +Clang compilation with omap1_defconfig on linux-next: + +arch/arm/mach-omap1/board-ams-delta.c:462:12: warning: unused function 'ams_delta_camera_power' [-Wunused-function] +static int ams_delta_camera_power(struct device *dev, int power) + ^ +1 warning generated. + +The soc_camera support was dropped without removing +ams_delta_camera_power() function, making it unused. + +Fixes: ce548396a433 ("media: mach-omap1: board-ams-delta.c: remove soc_camera dependencies") +Signed-off-by: Maciej Falkowski +Reviewed-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Tony Lindgren +Link: https://github.com/ClangBuiltLinux/linux/issues/1326 +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/mach-omap1/board-ams-delta.c | 14 -------------- + 1 file changed, 14 deletions(-) + +--- a/arch/arm/mach-omap1/board-ams-delta.c ++++ b/arch/arm/mach-omap1/board-ams-delta.c +@@ -458,20 +458,6 @@ static struct gpiod_lookup_table leds_gp + + #ifdef CONFIG_LEDS_TRIGGERS + DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger); +- +-static int ams_delta_camera_power(struct device *dev, int power) +-{ +- /* +- * turn on camera LED +- */ +- if (power) +- led_trigger_event(ams_delta_camera_led_trigger, LED_FULL); +- else +- led_trigger_event(ams_delta_camera_led_trigger, LED_OFF); +- return 0; +-} +-#else +-#define ams_delta_camera_power NULL + #endif + + static struct platform_device ams_delta_audio_device = { diff --git a/queue-5.10/series b/queue-5.10/series index 54aaa296d01..139c4c5190a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -7,6 +7,8 @@ revert-ucounts-increase-ucounts-reference-counter-before-the-security-hook.patch revert-cred-add-missing-return-error-code-when-set_cred_ucounts-failed.patch revert-add-a-reference-to-ucounts-for-each-cred.patch static_call-fix-unused-variable-warn-w-o-module.patch +xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch +arm-omap1-ams-delta-remove-unused-function-ams_delta_camera_power.patch gpu-ipu-v3-fix-i.mx-ipu-v3-offset-calculations-for-s.patch reset-reset-zynqmp-fixed-the-argument-data-type.patch qed-fix-the-vf-msix-vectors-flow.patch diff --git a/queue-5.10/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch b/queue-5.10/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch new file mode 100644 index 00000000000..25fc73dc19b --- /dev/null +++ b/queue-5.10/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch @@ -0,0 +1,40 @@ +From ed5aacc81cd41efc4d561e14af408d1003f7b855 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Wed, 26 May 2021 00:03:37 -0700 +Subject: xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG + +From: Randy Dunlap + +commit ed5aacc81cd41efc4d561e14af408d1003f7b855 upstream. + +XTENSA should only select HAVE_FUTEX_CMPXCHG when FUTEX is +set/enabled. This prevents a kconfig warning. + +WARNING: unmet direct dependencies detected for HAVE_FUTEX_CMPXCHG + Depends on [n]: FUTEX [=n] + Selected by [y]: + - XTENSA [=y] && !MMU [=n] + +Fixes: d951ba21b959 ("xtensa: nommu: select HAVE_FUTEX_CMPXCHG") +Signed-off-by: Randy Dunlap +Cc: Max Filippov +Cc: Chris Zankel +Cc: linux-xtensa@linux-xtensa.org +Message-Id: <20210526070337.28130-1-rdunlap@infradead.org> +Signed-off-by: Max Filippov +Signed-off-by: Greg Kroah-Hartman +--- + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/xtensa/Kconfig ++++ b/arch/xtensa/Kconfig +@@ -30,7 +30,7 @@ config XTENSA + select HAVE_DMA_CONTIGUOUS + select HAVE_EXIT_THREAD + select HAVE_FUNCTION_TRACER +- select HAVE_FUTEX_CMPXCHG if !MMU ++ select HAVE_FUTEX_CMPXCHG if !MMU && FUTEX + select HAVE_HW_BREAKPOINT if PERF_EVENTS + select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_OPROFILE