git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
[pandora-kernel.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index
e24254c
..
56f6fc1
100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-24,6
+24,7
@@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <linux/signal.h>
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <linux/signal.h>
+#include <linux/printk.h>
#include <linux/proc_fs.h>
#include <linux/security.h>
#include <linux/ctype.h>
#include <linux/proc_fs.h>
#include <linux/security.h>
#include <linux/ctype.h>
@@
-169,7
+170,8
@@
static int proc_taint(struct ctl_table *table, int write,
#endif
#ifdef CONFIG_MAGIC_SYSRQ
#endif
#ifdef CONFIG_MAGIC_SYSRQ
-static int __sysrq_enabled; /* Note: sysrq code ises it's own private copy */
+/* Note: sysrq code uses it's own private copy */
+static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
static int sysrq_sysctl_handler(ctl_table *table, int write,
void __user *buffer, size_t *lenp,
static int sysrq_sysctl_handler(ctl_table *table, int write,
void __user *buffer, size_t *lenp,
@@
-245,10
+247,6
@@
static struct ctl_table root_table[] = {
.mode = 0555,
.child = dev_table,
},
.mode = 0555,
.child = dev_table,
},
-/*
- * NOTE: do not add new entries to this table unless you have read
- * Documentation/sysctl/ctl_unnumbered.txt
- */
{ }
};
{ }
};
@@
-710,6
+708,15
@@
static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
.extra1 = &zero,
.extra2 = &one,
},
+ {
+ .procname = "kptr_restrict",
+ .data = &kptr_restrict,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &zero,
+ .extra2 = &two,
+ },
#endif
{
.procname = "ngroups_max",
#endif
{
.procname = "ngroups_max",
@@
-962,10
+969,6
@@
static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif
.proc_handler = proc_dointvec,
},
#endif
-/*
- * NOTE: do not add new entries to this table unless you have read
- * Documentation/sysctl/ctl_unnumbered.txt
- */
{ }
};
{ }
};
@@
-1326,11
+1329,6
@@
static struct ctl_table vm_table[] = {
.extra2 = &one,
},
#endif
.extra2 = &one,
},
#endif
-
-/*
- * NOTE: do not add new entries to this table unless you have read
- * Documentation/sysctl/ctl_unnumbered.txt
- */
{ }
};
{ }
};
@@
-1486,10
+1484,6
@@
static struct ctl_table fs_table[] = {
.proc_handler = &pipe_proc_fn,
.extra1 = &pipe_min_size,
},
.proc_handler = &pipe_proc_fn,
.extra1 = &pipe_min_size,
},
-/*
- * NOTE: do not add new entries to this table unless you have read
- * Documentation/sysctl/ctl_unnumbered.txt
- */
{ }
};
{ }
};
@@
-2894,7
+2888,7
@@
int proc_do_large_bitmap(struct ctl_table *table, int write,
}
}
}
}
-#else /* CONFIG_PROC_
FS
*/
+#else /* CONFIG_PROC_
SYSCTL
*/
int proc_dostring(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
int proc_dostring(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
@@
-2946,7
+2940,7
@@
int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
}
}
-#endif /* CONFIG_PROC_
FS
*/
+#endif /* CONFIG_PROC_
SYSCTL
*/
/*
* No sense putting this after each symbol definition, twice,
/*
* No sense putting this after each symbol definition, twice,