[linux-yocto] [PATCH] media: subdev: Fix the wrong reference of v4l2_subdev_state::lock
From: Kevin Hao
The v4l2_subdev_state::lock is a lock pointer, so the additional
dereferencing operator is not needed. These issues were introduced by
the following two commits:
b3ec78e409e0 ("media: subdev: add v4l2_subdev_set_routing helper()")
04b09e1e259f ("media: subdev: add stream based configuration")
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
v6.1/standard/ti-sdk-5.10/ti-j7xxx
drivers/media/v4l2-core/v4l2-subdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c
b/drivers/media/v4l2-core/v4l2-subdev.c
index 19c5cfc05bc0..01b44b996891 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1488,7 +1488,7 @@ int v4l2_subdev_set_routing(struct v4l2_subdev *sd,
struct v4l2_subdev_krouting *dst = &state->routing;
const struct v4l2_subdev_krouting *src = routing;
- lockdep_assert_held(&state->lock);
+ lockdep_assert_held(state->lock);
kvfree(dst->routes);
dst->routes = NULL;
@@ -1538,7 +1538,7 @@ v4l2_state_get_stream_format(struct v4l2_subdev_state
*state, unsigned int pad,
struct v4l2_subdev_stream_configs *stream_configs;
unsigned int i;
- lockdep_assert_held(&state->lock);
+ lockdep_assert_held(state->lock);
stream_configs = &state->stream_configs;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12626):
https://lists.yoctoproject.org/g/linux-yocto/message/12626
Mute This Topic: https://lists.yoctoproject.org/mt/99002748/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.112 v6.1.29 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.112 v6.1.29 for the following branches in the linux-yocto. 4f69e62a898e v5.15/standard/sdkv5.10/axxia 5e9f5f2c4644 v5.15/standard/preempt-rt/sdkv5.10/axxia 71fbcf542eb0 v5.15/standard/base 8cc51cef6e43 v5.15/standard/preempt-rt/base 7fb9db009bab v5.15/standard/cn-sdkv5.4/octeon #Have conflicts 6e8af66a5288 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have conflicts d51906e23096 v5.15/standard/cn-sdkv5.15/octeon #Have conflicts 94f80c91824d v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have conflicts 86dd0aa1ec93 v5.15/standard/ti-sdk-5.10/ti-j72xx 933a97c39de5 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 35a6b8339fda v5.15/standard/nxp-sdk-5.15/nxp-soc #Have build failures 79b8dab0213e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have build failures 6cb6a1855bf0 v5.15/standard/bcm-2xxx-rpi e8360b4682fa v5.15/standard/preempt-rt/bcm-2xxx-rpi 9e22e6dec2c5 v5.15/standard/nxp-sdk-5.15/nxp-s32g 1e0524a9af85 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 072e2eb2f121 v5.15/standard/intel-sdk-5.15/intel-socfpga a13bdea5a83b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga eab5d9d1ed28 v5.15/standard/x86 bab100cd18c5 v5.15/standard/preempt-rt/x86 d0a39f7d545f v5.15/standard/sdkv5.15/xlnx-soc 633b3d197247 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 7f828d7462d0 v6.1/standard/base 566c13db6587 v6.1/standard/preempt-rt/base 114fd6056886 v6.1/standard/ti-sdk-5.10/ti-j7xxx #Have build failures 724c950a302b v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx #Have build failures 84716ffc22da v6.1/standard/nxp-sdk-6.1/nxp-soc d67776245fb5 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 28ccefe2813a v6.1/standard/bcm-2xxx-rpi 490bee698190 v6.1/standard/preempt-rt/bcm-2xxx-rpi b12458371f8f v6.1/standard/nxp-sdk-5.15/nxp-s32g f1d552417a73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 7f828d7462d0 v6.1/standard/x86 c9faca3acc07 v6.1/standard/preempt-rt/x86 f36e9c7d39b8 v6.1/standard/sdkv6.1/xlnx-soc #Have conflicts and build failures a7a4865e7e7d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have conflicts and build failures According to the quantity of patches (134 in v5.15.112 and 239 in v6.1.29), this seems a regular release. But the merge conflicts and build failures are more than I have expected. I have folded the fix into the corresponding merge commit. There is also a fix [1] for the ti-j7xxx on the v6.1 kernel, it has nothing to do with this stable update and is just bug exposed by my build script. All these branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12626 Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12627): https://lists.yoctoproject.org/g/linux-yocto/message/12627 Mute This Topic: https://lists.yoctoproject.org/mt/99003148/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto][v6.1/standard/preempt-rt/base][PATCH] arm: fix warning "TIF_NOTIFY_SIGNAL" redefined
From: Quanyang Wang
In upstream commit 7578a7c0f296b ("ARM: renumber bits related to
_TIF_WORK_MASK"), the macros TIF_SYSCALL_AUDIT,TIF_SYSCALL_TRACEPOINT
and TIF_SECCOMP have been redefined to 21~23. But during merging,
the old values are brought back and now these macros are defined twice,
so we need drop the old values and place TIF_NOTIFY_SIGNAL and
TIF_NEED_RESCHED_LAZY in the right position.
It's to fix the warning:
arch/arm/include/asm/thread_info.h:136: warning: "TIF_NOTIFY_SIGNAL" redefined
136 | #define TIF_NOTIFY_SIGNAL 8 /* signal notifications exist */
|
arch/arm/include/asm/thread_info.h:132: note: this is the location of the
previous definition
132 | #define TIF_NOTIFY_SIGNAL 4 /* signal notifications exist */
Signed-off-by: Quanyang Wang
---
Hi Bruce,
Would you please help merge this patch to the branch:
v6.1/standard/preempt-rt/base
Thanks,
Quanyang
---
arch/arm/include/asm/thread_info.h | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/thread_info.h
b/arch/arm/include/asm/thread_info.h
index a0960a7ecb1f0..ffcbf8ebed4bf 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -130,11 +130,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp *,
#define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
#define TIF_UPROBE 3 /* breakpointed or singlestepping */
#define TIF_NOTIFY_SIGNAL 4 /* signal notifications exist */
-#define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
-#define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
-#define TIF_SECCOMP7 /* seccomp syscall filtering active */
-#define TIF_NOTIFY_SIGNAL 8 /* signal notifications exist */
-#define TIF_NEED_RESCHED_LAZY 9
+#define TIF_NEED_RESCHED_LAZY 5
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
--
2.36.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12628):
https://lists.yoctoproject.org/g/linux-yocto/message/12628
Mute This Topic: https://lists.yoctoproject.org/mt/99006201/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
