Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

[firefly-linux-kernel-4.4.55.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index e64540746c6381389f35972e2eb2df7a4abd0854..0a819e7a60c961246c529570fedf7717dd6c3c7c 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -805,6 +805,8 @@ struct efivar_entry {
        struct efi_variable var;
        struct list_head list;
        struct kobject kobj;
+       bool scanning;
+       bool deleting;
 };
 
 
@@ -870,6 +872,8 @@ void efivar_run_worker(void);
 #if defined(CONFIG_EFI_VARS) || defined(CONFIG_EFI_VARS_MODULE)
 int efivars_sysfs_init(void);
 
+#define EFIVARS_DATA_SIZE_MAX 1024
+
 #endif /* CONFIG_EFI_VARS */
 
 #ifdef CONFIG_EFI_RUNTIME_MAP