diff --git a/[refs] b/[refs] index cc9736a2541b..3a0f96992c74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdd71d132badad542a9ab99ab4a9c3c08fa6412f +refs/heads/master: c18b8a7cbcbac46497ee1ce656b0e68197c7581d diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 920eb7354d0a..2c33227b0f82 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1403,8 +1403,6 @@ extern unsigned int sysctl_sched_latency; extern unsigned int sysctl_sched_min_granularity; extern unsigned int sysctl_sched_wakeup_granularity; extern unsigned int sysctl_sched_batch_wakeup_granularity; -extern unsigned int sysctl_sched_stat_granularity; -extern unsigned int sysctl_sched_runtime_limit; extern unsigned int sysctl_sched_child_runs_first; extern unsigned int sysctl_sched_features; #endif diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index abd65ed9f2a5..5db7bd18e818 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -76,8 +76,6 @@ const_debug unsigned int sysctl_sched_batch_wakeup_granularity = 25000000UL; */ const_debug unsigned int sysctl_sched_wakeup_granularity = 2000000UL; -unsigned int sysctl_sched_runtime_limit __read_mostly; - extern struct sched_class fair_sched_class; /**************************************************************