This backports the following upstream commits: f9727a17db9: ("uuid: rename uuid types") df33767d9fe: ("uuid: hoist helpers uuid_equal() and uuid_copy() from xfs") ath10k now makes use of them. Some parts should go into the uapi/linux/uuid.h file, but then #include_next hack is not working correctly any more, so place it all into the normal file. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- backport/backport-include/linux/uuid.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 backport/backport-include/linux/uuid.h diff --git a/backport/backport-include/linux/uuid.h b/backport/backport-include/linux/uuid.h new file mode 100644 index 00000000..5ffe225b --- /dev/null +++ b/backport/backport-include/linux/uuid.h @@ -0,0 +1,25 @@ +#ifndef __BACKPORT_LINUX_UUID_H_ +#define __BACKPORT_LINUX_UUID_H_ +#include <linux/version.h> +#include_next <linux/uuid.h> + +#if LINUX_VERSION_IS_LESS(4,13,0) +#define guid_t uuid_le +#define uuid_t uuid_be + +static inline void guid_gen(guid_t *u) +{ + return uuid_le_gen(u); +} +static inline void uuid_gen(uuid_t *u) +{ + return uuid_be_gen(u); +} + +static inline void guid_copy(guid_t *dst, const guid_t *src) +{ + memcpy(dst, src, sizeof(guid_t)); +} +#endif + +#endif /* __BACKPORT_LINUX_UUID_H_ */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in