Skip to contentSkip to conversation

modpost: Mark uuid_le type to be suitable only for MEI

PATCH In review Andy Shevchenko 2 participants 2 messages Nov 25, 2022 – Nov 26, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 modpost: Mark uuid_le type to be suitable only for MEI

The uuid_le type is used only in MEI ABI, do not advertise it for others. While at it, comment out that UUID types are not to be used in a new code.

---

If you confused by acrn user of the uuid_le type, the patch to fix that is pending for v6.2 as well 1dbb4f0235a4 ("virt: acrn: Mark the uuid field as unused"). Nevertheless this patch doesn't break the things and hence can go independently to the respective tree.

 scripts/mod/file2alias.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
scripts/mod/file2alias.c +8 -4
index 7df23905fdf1..91c2e7ba5e52 100644
@@ -34,19 +34,23 @@ typedef Elf64_Addr	kernel_ulong_t;
 typedef uint32_t	__u32;
 typedef uint16_t	__u16;
 typedef unsigned char	__u8;
+
+/* UUID types for backward compatibility, don't use in new code */
 typedef struct {
 	__u8 b[16];
 } guid_t;
 
-/* backwards compatibility, don't use in new code */
-typedef struct {
-	__u8 b[16];
-} uuid_le;
 typedef struct {
 	__u8 b[16];
 } uuid_t;
+
 #define	UUID_STRING_LEN		36
 
+/* MEI UUID type, don't use anywhere else */
+typedef struct {
+	__u8 b[16];
+} uuid_le;
+
 /* Big exception to the "don't include kernel headers into userspace, which
  * even potentially has different endianness and word sizes, since
  * we handle those differences explicitly below */
Signature · 1 line
2.35.1
#1 lore raw
Quoted 7 lines · Andy Shevchenko

The uuid_le type is used only in MEI ABI, do not advertise it for others. While at it, comment out that UUID types are not to be used in a new code.

---

Applied to linux-kbuild.
Thanks.

Quoted 43 lines

If you confused by acrn user of the uuid_le type, the patch to fix that is pending for v6.2 as well 1dbb4f0235a4 ("virt: acrn: Mark the uuid field as unused"). Nevertheless this patch doesn't break the things and hence can go independently to the respective tree.

 scripts/mod/file2alias.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
scripts/mod/file2alias.c +8 -5
index 7df23905fdf1..91c2e7ba5e52 100644
@@ -34,19 +34,23 @@ typedef Elf64_Addr  kernel_ulong_t;
 typedef uint32_t       __u32;
 typedef uint16_t       __u16;
 typedef unsigned char  __u8;
+
+/* UUID types for backward compatibility, don't use in new code */
 typedef struct {
        __u8 b[16];
 } guid_t;
 
-/* backwards compatibility, don't use in new code */
-typedef struct {
-       __u8 b[16];
-} uuid_le;
 typedef struct {
        __u8 b[16];
 } uuid_t;
+
 #define        UUID_STRING_LEN         36
 
+/* MEI UUID type, don't use anywhere else */
+typedef struct {
+       __u8 b[16];
+} uuid_le;
+
 /* Big exception to the "don't include kernel headers into userspace, which
  * even potentially has different endianness and word sizes, since
  * we handle those differences explicitly below */
--

2.35.1

Signature · 2 lines
Best Regards
Masahiro Yamada