diff options
| author | Matt Fleming | 2015-01-12 10:33:25 +0100 |
|---|---|---|
| committer | Matt Fleming | 2015-01-12 10:33:25 +0100 |
| commit | 17473c32ce23568d39b076bf56159894bea1c61f (patch) | |
| tree | a0f37ab2301332d57b8632603d8835a1564f3acc /block | |
| parent | fs: Make efivarfs a pseudo filesystem, built by default with EFI (diff) | |
| parent | efi: Rename efi_guid_unparse to efi_guid_to_str (diff) | |
| download | kernel-qcow2-linux-17473c32ce23568d39b076bf56159894bea1c61f.tar.gz kernel-qcow2-linux-17473c32ce23568d39b076bf56159894bea1c61f.tar.xz kernel-qcow2-linux-17473c32ce23568d39b076bf56159894bea1c61f.zip | |
Merge tag 'rneri-efi-next' of https://github.com/ricardon/efi into next
Pull EFI changes for v3.20 from Ricardo Neri, who kindly picked them up
while I was out on annual leave in December.
Updates included:
*Rename the function efi_guid_unparse to reflect better its behavior. - Borislav Petkov
*Update the EFI firmware Kconfig help with the URL of efibootmgr. - Peter Jones
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/partitions/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/partitions/efi.c b/block/partitions/efi.c index 56d08fd75b1a..26cb624ace05 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c @@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state) state->parts[i + 1].flags = ADDPART_FLAG_RAID; info = &state->parts[i + 1].info; - efi_guid_unparse(&ptes[i].unique_partition_guid, info->uuid); + efi_guid_to_str(&ptes[i].unique_partition_guid, info->uuid); /* Naively convert UTF16-LE to 7 bits. */ label_max = min(ARRAY_SIZE(info->volname) - 1, |