diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 15:51:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 15:51:46 -0700 |
| commit | b9394d8a657cd3c064fa432aa0905c1b58b38fe9 (patch) | |
| tree | 5a0c98370f313fa11693ab72eea0dc809fd6567d /fs/Makefile | |
| parent | 126de6b20bfb82cc19012d5048f11f339ae5a021 (diff) | |
| parent | 7b2dd6d2c4db3912771bfcfd7ac7264011a3c831 (diff) | |
| download | linux-b9394d8a657cd3c064fa432aa0905c1b58b38fe9.tar.gz linux-b9394d8a657cd3c064fa432aa0905c1b58b38fe9.tar.bz2 linux-b9394d8a657cd3c064fa432aa0905c1b58b38fe9.zip | |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/efi changes from Peter Anvin:
"The bulk of these changes are cleaning up the efivars handling and
breaking it up into a tree of files. There are a number of fixes as
well.
The entire changeset is pretty big, but most of it is code movement.
Several of these commits are quite new; the history got very messed up
due to a mismerge with the urgent changes for rc8 which completely
broke IA64, and so Ingo requested that we rebase it to straighten it
out."
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: remove "kfree(NULL)"
efi: locking fix in efivar_entry_set_safe()
efi, pstore: Read data from variable store before memcpy()
efi, pstore: Remove entry from list when erasing
efi, pstore: Initialise 'entry' before iterating
efi: split efisubsystem from efivars
efivarfs: Move to fs/efivarfs
efivars: Move pstore code into the new EFI directory
efivars: efivar_entry API
efivars: Keep a private global pointer to efivars
efi: move utf16 string functions to efi.h
x86, efi: Make efi_memblock_x86_reserve_range more readable
efivarfs: convert to use simple_open()
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 5e67e57b59dc..f0db9c941a5f 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -125,3 +125,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/ obj-y += exofs/ # Multiple modules obj-$(CONFIG_CEPH_FS) += ceph/ obj-$(CONFIG_PSTORE) += pstore/ +obj-$(CONFIG_EFIVAR_FS) += efivarfs/ |