projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'md-3.8' of git://neil.brown.name/md
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
kernel
/
user.c
diff --git
a/kernel/user.c
b/kernel/user.c
index
750acff
..
33acb5e
100644
(file)
--- a/
kernel/user.c
+++ b/
kernel/user.c
@@
-16,6
+16,7
@@
#include <linux/interrupt.h>
#include <linux/export.h>
#include <linux/user_namespace.h>
#include <linux/interrupt.h>
#include <linux/export.h>
#include <linux/user_namespace.h>
+#include <linux/proc_fs.h>
/*
* userns count is 1 for root user, 1 for init_uts_ns,
/*
* userns count is 1 for root user, 1 for init_uts_ns,
@@
-51,6
+52,7
@@
struct user_namespace init_user_ns = {
},
.owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID,
},
.owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID,
+ .proc_inum = PROC_USER_INIT_INO,
};
EXPORT_SYMBOL_GPL(init_user_ns);
};
EXPORT_SYMBOL_GPL(init_user_ns);