summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-27 17:17:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 12:14:00 +0900
commitb144ce2d37619e05afdb0a15676500d76a64b1be (patch)
treec896c3c2cb4bc8135afb9f5128b38f250695c545 /scripts
parent039ae58503f3349157a852c2cd5555a630f0bfaf (diff)
downloadlinux-b144ce2d37619e05afdb0a15676500d76a64b1be.tar.gz
linux-b144ce2d37619e05afdb0a15676500d76a64b1be.tar.bz2
linux-b144ce2d37619e05afdb0a15676500d76a64b1be.zip
mei: fix up uuid matching
A previous commit, c93b76b34b4d ("mei: bus: report also uuid in module alias") caused a build error as I missed applying a needed patch to add some macros to uapi/linux/uuid.h. Instead of those additional macros, change the mei code to use the existing uuid structure directly. Fixes: c93b76b34b4d Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 62c517f4b592..718b2a29bd43 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -34,6 +34,9 @@ typedef Elf64_Addr kernel_ulong_t;
typedef uint32_t __u32;
typedef uint16_t __u16;
typedef unsigned char __u8;
+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
@@ -131,13 +134,13 @@ static inline void add_wildcard(char *str)
strcat(str + len, "*");
}
-static inline void add_uuid(char *str, __u8 uuid[16])
+static inline void add_uuid(char *str, uuid_le uuid)
{
int len = strlen(str);
int i;
for (i = 0; i < 16; i++)
- sprintf(str + len + (i << 1), "%02x", uuid[i]);
+ sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
}
/**