From 2c60fb9a8b47027e6cd05a00935f186932c50aa2 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 2 Dec 2009 18:58:05 +0100 Subject: [PATCH] --- yaml --- r: 175579 b: refs/heads/master c: 6b314d0e11924c803bf8cd944e87fd58cdb5088c h: refs/heads/master i: 175577: a448376fa83bad9455078aa8654576b6bb86f29a 175575: 765a04a73ec5eb42996e31ceae817ee02d03e8f3 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 1 - trunk/kernel/sysctl.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 11148721cf5e..22ad6e7991cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dba091b9e3522b9d32fc9975e48d3b69633b45f0 +refs/heads/master: 6b314d0e11924c803bf8cd944e87fd58cdb5088c diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 9b2402725088..ca72ed42ac34 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1905,7 +1905,6 @@ extern unsigned int sysctl_sched_shares_ratelimit; extern unsigned int sysctl_sched_shares_thresh; extern unsigned int sysctl_sched_child_runs_first; #ifdef CONFIG_SCHED_DEBUG -extern unsigned int sysctl_sched_features; extern unsigned int sysctl_sched_migration_cost; extern unsigned int sysctl_sched_nr_migrate; extern unsigned int sysctl_sched_time_avg; diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 4dbf93a52ee9..e5cc53514caa 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -314,14 +314,6 @@ static struct ctl_table kern_table[] = { .strategy = &sysctl_intvec, .extra1 = &zero, }, - { - .ctl_name = CTL_UNNUMBERED, - .procname = "sched_features", - .data = &sysctl_sched_features, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, { .ctl_name = CTL_UNNUMBERED, .procname = "sched_migration_cost",