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
UBIFS: remove another unneeded function parameter
[pandora-kernel.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index
44868e4
..
c68f68d
100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-225,21
+225,24
@@
static struct ctl_table root_table[] = {
};
#ifdef CONFIG_SCHED_DEBUG
};
#ifdef CONFIG_SCHED_DEBUG
-static
unsigned long min_sched_granularity_ns = 100000;
/* 100 usecs */
-static
unsigned long max_sched_granularity_ns = 1000000000
; /* 1 second */
-static
unsigned long min_wakeup_granularity_ns;
/* 0 usecs */
-static
unsigned long max_wakeup_granularity_ns = 1000000000
; /* 1 second */
+static
int min_sched_granularity_ns = 100000;
/* 100 usecs */
+static
int max_sched_granularity_ns = NSEC_PER_SEC
; /* 1 second */
+static
int min_wakeup_granularity_ns;
/* 0 usecs */
+static
int max_wakeup_granularity_ns = NSEC_PER_SEC
; /* 1 second */
#endif
static struct ctl_table kern_table[] = {
#ifdef CONFIG_SCHED_DEBUG
{
.ctl_name = CTL_UNNUMBERED,
#endif
static struct ctl_table kern_table[] = {
#ifdef CONFIG_SCHED_DEBUG
{
.ctl_name = CTL_UNNUMBERED,
- .procname = "sched_
nr_latency
",
- .data = &sysctl_sched_
nr_latenc
y,
+ .procname = "sched_
min_granularity_ns
",
+ .data = &sysctl_sched_
min_granularit
y,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = &proc_dointvec,
+ .proc_handler = &sched_nr_latency_handler,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_sched_granularity_ns,
+ .extra2 = &max_sched_granularity_ns,
},
{
.ctl_name = CTL_UNNUMBERED,
},
{
.ctl_name = CTL_UNNUMBERED,
@@
-247,7
+250,7
@@
static struct ctl_table kern_table[] = {
.data = &sysctl_sched_latency,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.data = &sysctl_sched_latency,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = &
proc_dointvec_minmax
,
+ .proc_handler = &
sched_nr_latency_handler
,
.strategy = &sysctl_intvec,
.extra1 = &min_sched_granularity_ns,
.extra2 = &max_sched_granularity_ns,
.strategy = &sysctl_intvec,
.extra1 = &min_sched_granularity_ns,
.extra2 = &max_sched_granularity_ns,
@@
-298,6
+301,14
@@
static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
.mode = 0644,
.proc_handler = &proc_dointvec,
},
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "sched_nr_migrate",
+ .data = &sysctl_sched_nr_migrate,
+ .maxlen = sizeof(unsigned int),
+ .mode = 644,
+ .proc_handler = &proc_dointvec,
+ },
#endif
{
.ctl_name = CTL_UNNUMBERED,
#endif
{
.ctl_name = CTL_UNNUMBERED,
@@
-895,11
+906,11
@@
static struct ctl_table vm_table[] = {
},
{
.ctl_name = CTL_UNNUMBERED,
},
{
.ctl_name = CTL_UNNUMBERED,
- .procname = "
hugetlb_dynamic_pool
",
- .data = &
hugetlb_dynamic_pool
,
- .maxlen = sizeof(
hugetlb_dynamic_pool
),
+ .procname = "
nr_overcommit_hugepages
",
+ .data = &
nr_overcommit_huge_pages
,
+ .maxlen = sizeof(
nr_overcommit_huge_pages
),
.mode = 0644,
.mode = 0644,
- .proc_handler = &proc_do
intvec
,
+ .proc_handler = &proc_do
ulongvec_minmax
,
},
#endif
{
},
#endif
{
@@
-1577,6
+1588,10
@@
struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
void unregister_sysctl_table(struct ctl_table_header * header)
{
might_sleep();
void unregister_sysctl_table(struct ctl_table_header * header)
{
might_sleep();
+
+ if (header == NULL)
+ return;
+
spin_lock(&sysctl_lock);
start_unregistering(header);
spin_unlock(&sysctl_lock);
spin_lock(&sysctl_lock);
start_unregistering(header);
spin_unlock(&sysctl_lock);
@@
-2278,7
+2293,7
@@
static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp
pid_t tmp;
int r;
pid_t tmp;
int r;
- tmp = pid_nr
(cad_pid
);
+ tmp = pid_nr
_ns(cad_pid, current->nsproxy->pid_ns
);
r = __do_proc_dointvec(&tmp, table, write, filp, buffer,
lenp, ppos, NULL, NULL);
r = __do_proc_dointvec(&tmp, table, write, filp, buffer,
lenp, ppos, NULL, NULL);
@@
-2609,6
+2624,10
@@
static int deprecated_sysctl_warning(struct __sysctl_args *args)
int name[CTL_MAXNAME];
int i;
int name[CTL_MAXNAME];
int i;
+ /* Check args->nlen. */
+ if (args->nlen < 0 || args->nlen > CTL_MAXNAME)
+ return -ENOTDIR;
+
/* Read in the sysctl name for better debug message logging */
for (i = 0; i < args->nlen; i++)
if (get_user(name[i], args->name + i))
/* Read in the sysctl name for better debug message logging */
for (i = 0; i < args->nlen; i++)
if (get_user(name[i], args->name + i))