hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUrfd/AAoJECYUxVC6df4Sd7kP/RP4uzJQnQTteg2ys2Zk2sEe
 rWdjxtcQurnP5P07SqNV/dZIWQx6hG/l61herFzryq9JKNye70fCd8bGl4sOPiHW
 i64FJtmCF+3vgLhJK2s6Ysub/xPdC0zkRXIIHvulX1nwZRWXiPzkJPzFlkCbXaW1
 O3ykSBIT4EwXAe84dN1Oio476Zyf/rS81rKakYXKwYNrfSKTmyH2FUlZODaSL+0a
 oGpae/2kps6rqdlOq19J5VKcYE3CTzy+Pv3QhqVlgywWF0AIUOHrcWpsWTv4IhKr
 v8blQcy7QZ/QWOEg7Nnus48/Mh0sNdAy497ZV4/tgmBfkGUcHD5qX5/Fy6Yp+/0R
 YJfRv5fTDyxYp6krdEeUnOphaXZT2jkG8uRdLJxNBONWBkwf/i9QXcmwuJc0+sgF
 7NKP8/kbqc3A6blQ/RNQRdeLW0hAAXfrVHj/zW8Fbi0PJTn+ALTTyvjDhMwYOr46
 IVbm1CzGQLXGNDFWvxRlMbzQa5PktiiqOxymTNJ6HZwP8TnS5IE5f/iEVpj5Yd+z
 zbYQcpBiN8VnQsKBmq04865/OrNgQRcUC+OU6Mz1iIIEIF8NLBDoRfE/oX0I+dEC
 jc0wTszmr0uXAu6dP4tgQEaQ0oNdOE806+BZ++3bpaZ3GCScjYtDOnSdsFB5ByYp
 dsAqvfPW8uY+I27SXMat
 =aLDw
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Matt Fleming 2015-01-12 09:33:25 +00:00
parent 62c204ddfe 26e022727f
commit 17473c32ce
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/partitions/efi.c
View File

@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state)
state->parts[i + 1].flags = ADDPART_FLAG_RAID; state->parts[i + 1].flags = ADDPART_FLAG_RAID;
info = &state->parts[i + 1].info; 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. */ /* Naively convert UTF16-LE to 7 bits. */
label_max = min(ARRAY_SIZE(info->volname) - 1, label_max = min(ARRAY_SIZE(info->volname) - 1,

4
drivers/firmware/efi/Kconfig
View File

@ -12,11 +12,11 @@ config EFI_VARS
Note that using this driver in concert with efibootmgr requires Note that using this driver in concert with efibootmgr requires
at least test release version 0.5.0-test3 or later, which is at least test release version 0.5.0-test3 or later, which is
available from Matt Domsch's website located at: available from:
<http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz>
Subsequent efibootmgr releases may be found at: Subsequent efibootmgr releases may be found at:
<http://linux.dell.com/efibootmgr> <http://github.com/vathpela/efibootmgr>
config EFI_VARS_PSTORE config EFI_VARS_PSTORE
tristate "Register efivars backend for pstore" tristate "Register efivars backend for pstore"

4
drivers/firmware/efi/efi.c
View File

@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid,
int i; int i;
if (table_types) { if (table_types) {
efi_guid_unparse(guid, str); efi_guid_to_str(guid, str);
for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) { for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) {
efi_guid_unparse(&table_types[i].guid, str); efi_guid_to_str(&table_types[i].guid, str);
if (!efi_guidcmp(*guid, table_types[i].guid)) { if (!efi_guidcmp(*guid, table_types[i].guid)) {
*(table_types[i].ptr) = table; *(table_types[i].ptr) = table;

6
drivers/firmware/efi/efivars.c
View File

@ -39,7 +39,7 @@
* fix locking per Peter Chubb's findings * fix locking per Peter Chubb's findings
* *
* 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com> * 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com>
* move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_unparse() * move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_to_str()
* *
* 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com> * 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com>
* use list_for_each_safe when deleting vars. * use list_for_each_safe when deleting vars.
@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry *entry, char *buf)
if (!entry || !buf) if (!entry || !buf)
return 0; return 0;
efi_guid_unparse(&var->VendorGuid, str); efi_guid_to_str(&var->VendorGuid, str);
str += strlen(str); str += strlen(str);
str += sprintf(str, "\n"); str += sprintf(str, "\n");
@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
private variables from another's. */ private variables from another's. */
*(short_name + strlen(short_name)) = '-'; *(short_name + strlen(short_name)) = '-';
efi_guid_unparse(&new_var->var.VendorGuid, efi_guid_to_str(&new_var->var.VendorGuid,
short_name + strlen(short_name)); short_name + strlen(short_name));
new_var->kobj.kset = efivars_kset; new_var->kobj.kset = efivars_kset;

2
fs/efivarfs/super.c
View File

@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
name[len] = '-'; name[len] = '-';
efi_guid_unparse(&entry->var.VendorGuid, name + len + 1); efi_guid_to_str(&entry->var.VendorGuid, name + len + 1);
name[len + EFI_VARIABLE_GUID_LEN+1] = '\0'; name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';

2
include/linux/efi.h
View File

@ -844,7 +844,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
} }
static inline char * static inline char *
efi_guid_unparse(efi_guid_t *guid, char *out) efi_guid_to_str(efi_guid_t *guid, char *out)
{ {
sprintf(out, "%pUl", guid->b); sprintf(out, "%pUl", guid->b);
return out; return out;