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/nfsd/nfsctl.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/nfsd/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 13a21c8fca49..f33455b4d957 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
| @@ -1090,6 +1090,7 @@ static struct file_system_type nfsd_fs_type = { | |||
| 1090 | .mount = nfsd_mount, | 1090 | .mount = nfsd_mount, |
| 1091 | .kill_sb = nfsd_umount, | 1091 | .kill_sb = nfsd_umount, |
| 1092 | }; | 1092 | }; |
| 1093 | MODULE_ALIAS_FS("nfsd"); | ||
| 1093 | 1094 | ||
| 1094 | #ifdef CONFIG_PROC_FS | 1095 | #ifdef CONFIG_PROC_FS |
| 1095 | static int create_proc_exports_entry(void) | 1096 | static int create_proc_exports_entry(void) |