Re: [patch/backport] CFS scheduler, -v24, for v2.6.24-rc3, v2.6.23.8,v2.6.22.13, v2.6.21.7

[Ingo Molnar <mingo@elte.hu>]

* David <david@livux.com> wrote:

> Hi Ingo,
> 
> Thnx a lot for theses backports...
> 
> Ran into this while compiling a 2.6.23.8 with CFS v24
> 
> Compiling with CONFIG_FAIR_GROUP_SCHED disabled :
> 
> kernel/sysctl.c:305: error: 'sysctl_sched_min_bal_int_shares' undeclared here (not in a function)
> kernel/sysctl.c:313: error: 'sysctl_sched_max_bal_int_shares' undeclared here (not in a function)
> 
> I made that patch to make it compile.

thanks - i've applied your fix and have re-uploaded under the same 
filenames - so if anyone hits this problem it can be fixed by 
re-downloading the same patch again. Find below the current set of -v24 
build fixlets.

	Ingo

--- linux.orig/kernel/sysctl.c
+++ linux/kernel/sysctl.c
@@ -309,6 +309,7 @@ static struct ctl_table kern_table[] = {
 		.mode		= 644,
 		.proc_handler	= &proc_dointvec,
 	},
+#ifdef CONFIG_FAIR_GROUP_SCHED
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "sched_min_bal_int_shares",
@@ -326,6 +327,7 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
+#endif
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "sched_compat_yield",
--- linux.orig/include/linux/sched.h
+++ linux/include/linux/sched.h
@@ -10,7 +10,7 @@
 #define COMPAT_REGISTER_SYSCTL
 
 /* backporting helper macro: */
-#define cpu_sibling_map(cpu) per_cpu(cpu_sibling_map, cpu)
+#define cpu_sibling_map(cpu) cpu_sibling_map[cpu]
 
 /*
  * cloning flags:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/