diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 04:51:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 04:51:54 +0400 |
| commit | 20b4fb485227404329e41ad15588afad3df23050 (patch) | |
| tree | f3e099f0ab3da8a93b447203e294d2bb22f6dc05 /fs/efivarfs | |
| parent | b9394d8a657cd3c064fa432aa0905c1b58b38fe9 (diff) | |
| parent | ac3e3c5b1164397656df81b9e9ab4991184d3236 (diff) | |
| download | linux-20b4fb485227404329e41ad15588afad3df23050.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS updates from Al Viro,
Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).
7kloc removed.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
don't bother with deferred freeing of fdtables
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
proc: Make the PROC_I() and PDE() macros internal to procfs
proc: Supply a function to remove a proc entry by PDE
take cgroup_open() and cpuset_open() to fs/proc/base.c
ppc: Clean up scanlog
ppc: Clean up rtas_flash driver somewhat
hostap: proc: Use remove_proc_subtree()
drm: proc: Use remove_proc_subtree()
drm: proc: Use minor->index to label things, not PDE->name
drm: Constify drm_proc_list[]
zoran: Don't print proc_dir_entry data in debug
reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
proc: Supply an accessor for getting the data from a PDE's parent
airo: Use remove_proc_subtree()
rtl8192u: Don't need to save device proc dir PDE
rtl8187se: Use a dir under /proc/net/r8180/
proc: Add proc_mkdir_data()
proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
proc: Move PDE_NET() to fs/proc/proc_net.c
...
Diffstat (limited to 'fs/efivarfs')
| -rw-r--r-- | fs/efivarfs/file.c | 1 | ||||
| -rw-r--r-- | fs/efivarfs/inode.c | 1 | ||||
| -rw-r--r-- | fs/efivarfs/super.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c index ede07fc7309f..bfb531564319 100644 --- a/fs/efivarfs/file.c +++ b/fs/efivarfs/file.c @@ -9,6 +9,7 @@ #include <linux/efi.h> #include <linux/fs.h> +#include <linux/slab.h> #include "internal.h" diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c index 640e289d522e..7e787fb90293 100644 --- a/fs/efivarfs/inode.c +++ b/fs/efivarfs/inode.c @@ -10,6 +10,7 @@ #include <linux/efi.h> #include <linux/fs.h> #include <linux/ctype.h> +#include <linux/slab.h> #include "internal.h" diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index 525a2a1ac16c..141aee31884f 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -13,6 +13,8 @@ #include <linux/module.h> #include <linux/pagemap.h> #include <linux/ucs2_string.h> +#include <linux/slab.h> +#include <linux/magic.h> #include "internal.h" |