diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /fs/proc/root.c | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 4e42aba97f2e..ede8e64974be 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -91,7 +91,7 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, | |||
| 91 | { | 91 | { |
| 92 | struct pid_namespace *ns; | 92 | struct pid_namespace *ns; |
| 93 | 93 | ||
| 94 | if (flags & MS_KERNMOUNT) { | 94 | if (flags & SB_KERNMOUNT) { |
| 95 | ns = data; | 95 | ns = data; |
| 96 | data = NULL; | 96 | data = NULL; |
| 97 | } else { | 97 | } else { |