projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index b13e9d2de302411438ba62898ca27697130d38b0..19b62b522158acb6414cd7440b25e64bd16add35 100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-871,6
+871,13
@@
static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
.extra1 = &zero,
.extra2 = &one,
},
+ {
+ .procname = "watchdog_cpumask",
+ .data = &watchdog_cpumask_bits,
+ .maxlen = NR_CPUS,
+ .mode = 0644,
+ .proc_handler = proc_watchdog_cpumask,
+ },
{
.procname = "softlockup_panic",
.data = &softlockup_panic,
{
.procname = "softlockup_panic",
.data = &softlockup_panic,
@@
-1531,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",
@@
-1690,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
{