diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /fs/proc/root.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index f6299a25594e..1e15a2b176e8 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -83,7 +83,8 @@ static int proc_get_sb(struct file_system_type *fs_type, | |||
| 83 | ns->proc_mnt = mnt; | 83 | ns->proc_mnt = mnt; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | return simple_set_mnt(mnt, sb); | 86 | simple_set_mnt(mnt, sb); |
| 87 | return 0; | ||
| 87 | } | 88 | } |
| 88 | 89 | ||
| 89 | static void proc_kill_sb(struct super_block *sb) | 90 | static void proc_kill_sb(struct super_block *sb) |