diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
| commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
| tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /fs/debugfs/inode.c | |
| parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
| parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/debugfs/inode.c')
| -rw-r--r-- | fs/debugfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 0c4f80b447fb..4888cb3fdef7 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -299,6 +299,7 @@ static struct file_system_type debug_fs_type = { | |||
| 299 | .mount = debug_mount, | 299 | .mount = debug_mount, |
| 300 | .kill_sb = kill_litter_super, | 300 | .kill_sb = kill_litter_super, |
| 301 | }; | 301 | }; |
| 302 | MODULE_ALIAS_FS("debugfs"); | ||
| 302 | 303 | ||
| 303 | static struct dentry *__create_file(const char *name, umode_t mode, | 304 | static struct dentry *__create_file(const char *name, umode_t mode, |
| 304 | struct dentry *parent, void *data, | 305 | struct dentry *parent, void *data, |