[Mactel-linux-devel] [PATCH] - make sure that EFI variable data size is always 64 bit

[Matthew G. <mj...@sr...>]

The EFI spec states that the data size of an EFI variable is 64 bits. 
"unsigned long", on the other hand, isn't on IA32.

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index bda5bce..488c24c 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -110,7 +110,7 @@ static LIST_HEAD(efivar_list);
 struct efi_variable {
 	efi_char16_t  VariableName[1024/sizeof(efi_char16_t)];
 	efi_guid_t    VendorGuid;
-	unsigned long DataSize;
+	__u64	      DataSize;
 	__u8          Data[1024];
 	efi_status_t  Status;
 	__u32         Attributes;
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 9e97bc2..3f0a179 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -163,7 +163,7 @@ typedef efi_status_t efi_get_wakeup_time
 					    efi_time_t *tm);
 typedef efi_status_t efi_set_wakeup_time_t (efi_bool_t enabled, efi_time_t *tm);
 typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, u32 *attr,
-					 unsigned long *data_size, void *data);
+					 __u64 *data_size, void *data);
 typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,
 					      efi_guid_t *vendor);
 typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, 

-- 
Matthew Garrett | mj...@sr...