| Message ID | 20221125101249.24931-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/1] modpost: Mark uuid_le type to be suitable only for MEI | expand |
On Fri, Nov 25, 2022 at 7:12 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > 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. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > Applied to linux-kbuild. Thanks. > 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(-) > > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c > index 7df23905fdf1..91c2e7ba5e52 100644 > --- a/scripts/mod/file2alias.c > +++ b/scripts/mod/file2alias.c > @@ -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 >
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 7df23905fdf1..91c2e7ba5e52 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -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 */
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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- 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(-)