projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index
812fcc3
..
19b62b5
100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-1538,12
+1538,6
@@
static struct ctl_table vm_table[] = {
{ }
};
{ }
};
-#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
-static struct ctl_table binfmt_misc_table[] = {
- { }
-};
-#endif
-
static struct ctl_table fs_table[] = {
{
.procname = "inode-nr",
static struct ctl_table fs_table[] = {
{
.procname = "inode-nr",
@@
-1697,7
+1691,7
@@
static struct ctl_table fs_table[] = {
{
.procname = "binfmt_misc",
.mode = 0555,
{
.procname = "binfmt_misc",
.mode = 0555,
- .child =
binfmt_misc_table
,
+ .child =
sysctl_mount_point
,
},
#endif
{
},
#endif
{