diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:27:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:27:21 -0700 |
| commit | ae71948f398eb2572148006bf34f0c6d934206cb (patch) | |
| tree | cdbb8d41a72ae086251a44c26cf24be6854c2e9c /include/linux/efi.h | |
| parent | Merge tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux (diff) | |
| parent | efi: switch to use new generic UUID API (diff) | |
| download | linux-dev-ae71948f398eb2572148006bf34f0c6d934206cb.tar.xz linux-dev-ae71948f398eb2572148006bf34f0c6d934206cb.zip | |
Merge tag 'uuid-for-4.14' of git://git.infradead.org/users/hch/uuid
Pull uuid updates from Christoph Hellwig:
"Just a single conversion to the new UUID API for this merge window"
* tag 'uuid-for-4.14' of git://git.infradead.org/users/hch/uuid:
efi: switch to use new generic UUID API
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 65905c3cb655..66f4a4e79f4b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -47,10 +47,10 @@ typedef u16 efi_char16_t; /* UNICODE character */ typedef u64 efi_physical_addr_t; typedef void *efi_handle_t; -typedef uuid_le efi_guid_t; +typedef guid_t efi_guid_t; #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \ - UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) + GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) /* * Generic EFI table header |