git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[sfrench/cifs-2.6.git]
/
fs
/
proc
/
root.c
diff --git
a/fs/proc/root.c
b/fs/proc/root.c
index 4e42aba97f2e3ed694aa5df146ecbf949c0b3f68..ede8e64974be240368d11ab47f3227f72a016e23 100644
(file)
--- 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,
{
struct pid_namespace *ns;
- if (flags &
MS
_KERNMOUNT) {
+ if (flags &
SB
_KERNMOUNT) {
ns = data;
data = NULL;
} else {