projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[WATCHDOG] mpc5200_wdt clean-up
[powerpc.git]
/
kernel
/
utsname_sysctl.c
diff --git
a/kernel/utsname_sysctl.c
b/kernel/utsname_sysctl.c
index
324aa13
..
c76c064
100644
(file)
--- a/
kernel/utsname_sysctl.c
+++ b/
kernel/utsname_sysctl.c
@@
-18,10
+18,7
@@
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;
- which = (which - (char *)&init_uts_ns) + (char *)uts_ns;
-#endif
+
if (!write)
down_read(&uts_sem);
else
if (!write)
down_read(&uts_sem);
else
@@
-139,7
+136,7
@@
static struct ctl_table uts_root_table[] = {
static int __init utsname_sysctl_init(void)
{
static int __init utsname_sysctl_init(void)
{
- register_sysctl_table(uts_root_table
, 0
);
+ register_sysctl_table(uts_root_table);
return 0;
}
return 0;
}