diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 11:41:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 16:01:49 +0800 |
| commit | 70e00db9eb8ffc4dcaf5f035ec6a4440ba428794 (patch) | |
| tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 /fs/efivarfs/internal.h | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
| parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c (diff) | |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14lsk-v3.14-16.03linux-linaro-lsk-v3.14
Conflicts:
Most of conflicts are due to efivar_validate() change which
introduced a new parameter to check efi guid.
I added efi guid for this change in sanity_check()/efivar_create()
in drivers/firmware/efi/efivars.c
and keep new efivar_validate() in drivers/firmware/efi/vars.c,
since it's newer than LSK version.
nothing need mentioned in include/linux/efi.h
Diffstat (limited to 'fs/efivarfs/internal.h')
| -rw-r--r-- | fs/efivarfs/internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/efivarfs/internal.h b/fs/efivarfs/internal.h index b5ff16addb7c..b4505188e799 100644 --- a/fs/efivarfs/internal.h +++ b/fs/efivarfs/internal.h @@ -15,7 +15,8 @@ extern const struct file_operations efivarfs_file_operations; extern const struct inode_operations efivarfs_dir_inode_operations; extern bool efivarfs_valid_name(const char *str, int len); extern struct inode *efivarfs_get_inode(struct super_block *sb, - const struct inode *dir, int mode, dev_t dev); + const struct inode *dir, int mode, dev_t dev, + bool is_removable); extern struct list_head efivarfs_list; |