mirror of
https://git.yoctoproject.org/poky
synced 2026-02-26 11:29:40 +01:00
c82f7a0577
Backport 'connector: Fix invalid conversion in cn_proc.h' commit to fix error: / |/usr/include/linux/cn_proc.h: In function 'proc_cn_event | valid_event(proc_cn_event)': |/usr/include/linux/cn_proc.h:72:17: error: invalid conversion from | 'unsigned int' to 'proc_cn_event' [-fpermissive] | 72 | ev_type &= PROC_EVENT_ALL; | | ^ | | | | | unsigned int \ Change is already merged in kernel branch linux-6.6.y [1]. 1 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=06e785aeb9ea8a43d0a3967c1ba6e69d758e82d4 (From OE-Core rev: f023779af6c0e5c838bdacbd6d9765d1c6740575) Signed-off-by: Fabio Berton <fbberton@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 06e785aeb9ea8a43d0a3967c1ba6e69d758e82d4 Mon Sep 17 00:00:00 2001
|
|
From: Matt Jan <zoo868e@gmail.com>
|
|
Date: Tue, 14 May 2024 12:10:46 +0800
|
|
Subject: [PATCH] connector: Fix invalid conversion in cn_proc.h
|
|
|
|
The implicit conversion from unsigned int to enum
|
|
proc_cn_event is invalid, so explicitly cast it
|
|
for compilation in a C++ compiler.
|
|
/usr/include/linux/cn_proc.h: In function 'proc_cn_event valid_event(proc_cn_event)':
|
|
/usr/include/linux/cn_proc.h:72:17: error: invalid conversion from 'unsigned int' to 'proc_cn_event' [-fpermissive]
|
|
72 | ev_type &= PROC_EVENT_ALL;
|
|
| ^
|
|
| |
|
|
| unsigned int
|
|
|
|
Signed-off-by: Matt Jan <zoo868e@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9258d795978f398ecf2d222a8388cff81d37d34d]
|
|
---
|
|
include/uapi/linux/cn_proc.h | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/include/uapi/linux/cn_proc.h b/include/uapi/linux/cn_proc.h
|
|
index f2afb7cc4926..18e3745b86cd 100644
|
|
--- a/include/uapi/linux/cn_proc.h
|
|
+++ b/include/uapi/linux/cn_proc.h
|
|
@@ -69,8 +69,7 @@ struct proc_input {
|
|
|
|
static inline enum proc_cn_event valid_event(enum proc_cn_event ev_type)
|
|
{
|
|
- ev_type &= PROC_EVENT_ALL;
|
|
- return ev_type;
|
|
+ return (enum proc_cn_event)(ev_type & PROC_EVENT_ALL);
|
|
}
|
|
|
|
/*
|
|
--
|
|
2.50.1
|
|
|