projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
kernel
/
utsname_sysctl.c
diff --git
a/kernel/utsname_sysctl.c
b/kernel/utsname_sysctl.c
index f22b9dbd2a9c734163d65f60b1ef67c1b5259858..fe3a56c2256d7ee44e46813aeee597559ba29131 100644
(file)
--- a/
kernel/utsname_sysctl.c
+++ b/
kernel/utsname_sysctl.c
@@
-18,10
+18,11
@@
static void *get_uts(ctl_table *table, int write)
{
char *which = table->data;
static void *get_uts(ctl_table *table, int write)
{
char *which = table->data;
-#ifdef CONFIG_UTS_NS
- struct uts_namespace *uts_ns = current->nsproxy->uts_ns;
+ struct uts_namespace *uts_ns;
+
+ uts_ns = current->nsproxy->uts_ns;
which = (which - (char *)&init_uts_ns) + (char *)uts_ns;
which = (which - (char *)&init_uts_ns) + (char *)uts_ns;
-#endif
+
if (!write)
down_read(&uts_sem);
else
if (!write)
down_read(&uts_sem);
else