diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 09:48:53 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 09:48:53 (GMT) |
commit | 595247f61f9840222a4dec4baefd66ad6d5b0d6a (patch) | |
tree | c5cd38244fdac8ba3c119038f1116b7a5829c0f5 /fs | |
parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
parent | 8266e31ed0fedb7ee16ebc86e80468f7cc1bbb4e (diff) | |
download | linux-595247f61f9840222a4dec4baefd66ad6d5b0d6a.tar.xz |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi
Pull EFI updates for v3.19 from Matt Fleming:
- Support module unload for efivarfs - Mathias Krause
- Another attempt at moving x86 to libstub taking advantage of the
__pure attribute - Ard Biesheuvel
- Add EFI runtime services section to ptdump - Mathias Krause
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/efivarfs/super.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index 0a48886..6dad117 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -236,6 +236,7 @@ static void efivarfs_kill_sb(struct super_block *sb) } static struct file_system_type efivarfs_type = { + .owner = THIS_MODULE, .name = "efivarfs", .mount = efivarfs_mount, .kill_sb = efivarfs_kill_sb, @@ -244,17 +245,23 @@ static struct file_system_type efivarfs_type = { static __init int efivarfs_init(void) { if (!efi_enabled(EFI_RUNTIME_SERVICES)) - return 0; + return -ENODEV; if (!efivars_kobject()) - return 0; + return -ENODEV; return register_filesystem(&efivarfs_type); } +static __exit void efivarfs_exit(void) +{ + unregister_filesystem(&efivarfs_type); +} + MODULE_AUTHOR("Matthew Garrett, Jeremy Kerr"); MODULE_DESCRIPTION("EFI Variable Filesystem"); MODULE_LICENSE("GPL"); MODULE_ALIAS_FS("efivarfs"); module_init(efivarfs_init); +module_exit(efivarfs_exit); |